Merge branch 'master' of github.com:Sankore/Sankore-3.1

resources/library/interactive/Graphme.wgt/Grapheur.xhtml

@@ -17,9 +17,24 @@
         <script type="text/javascript" src="JavaScript/Affichage3D.js"></script>
         <script type="text/javascript" src="JavaScript/AffichageUniboard.js"></script>
         <script type="text/javascript" src="JavaScript/AffichageXPM.js"></script>
+
+        <script src="JavaScript/jQuery/jquery-1.3.2.min.js" type="text/javascript"></script>
+        <script src="JavaScript/jQuery/jquery.disable.text.select.js" type="text/javascript"></script>
         <script type="text/javascript">
 // <![CDATA[
         // --- Variables nécessaires au fonctionnement du widget ---
+                $(document).ready(function(){
+                    $(document).disableTextSelect();
+                   
+                    $("input").mouseover(function(){
+                        $(document).enableTextSelect(); 
+                    });
+                    
+                    $("input").mouseout(function(){
+                        $(document).disableTextSelect(); 
+                    });
+                    //$("input").change(function(){$(this).trigger('blur');});
+                });
                 var largeur = 500
                 var hauteur = 400
                 var graphique = ""

src/adaptors/UBCFFSubsetAdaptor.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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 UBCFFSUBSETADAPTOR_H
 #define UBCFFSUBSETADAPTOR_H
 
@@ -8,6 +23,8 @@
 class UBDocumentProxy;
 class UBGraphicsScene;
 class QSvgGenerator;
+class UBGraphicsSvgItem;
+class QTransform;
 
 class UBCFFSubsetAdaptor
 {
@@ -42,8 +59,10 @@ private:
     private:
         QString mTempFilePath;
         UBGraphicsScene *mCurrentScene;
+        QRectF mCurrentSceneRect;
         QString mIndent;
         QRectF mViewBox;
+        QPointF mViewBoxCenter;
         QSize mSize;
 
         //methods to store current xml parse state
@@ -63,6 +82,7 @@ private:
         bool parseRect();
         bool parseEllipse();
         bool parseTextArea();
+        bool parseText();
         bool parsePolygon();
         bool parsePage();
         bool parsePageSet();
@@ -75,11 +95,16 @@ private:
         int currentState;
 
         //helper methods
+        bool getCurElementTransorm(QTransform &transform);
+        void repositionSvgItem(UBGraphicsSvgItem *item, qreal width, qreal height, qreal x, qreal y, bool useTransform, QTransform &transform);
         QColor colorFromString(const QString& clrString);
         QTransform transformFromString(const QString trString);
         bool getViewBoxDimenstions(const QString& viewBox);
-        QSvgGenerator* createSvgGenerator();
+        QSvgGenerator* createSvgGenerator(qreal width, qreal height);
         bool getTempFileName();
+        void parseTextAttributes(qreal &fontSize, QColor &fontColor,
+                                 QString &fontFamily, QString &fontStretch, bool &italic,
+                                 int &fontWeight, int &textAlign, QTransform &fontTransform);
     };
 };
 

src/adaptors/UBImportCFF.cpp

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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 <QDir>
-#include "UBImportCFF.h"
-#include "document/UBDocumentProxy.h"
 
 #include "core/UBApplication.h"
 #include "core/UBPersistenceManager.h"
 #include "core/UBDocumentManager.h"
 #include "core/memcheck.h"
 #include "core/UBPersistenceManager.h"
-
-#include "frameworks/UBFileSystemUtils.h"
-
+#include "document/UBDocumentProxy.h"
 #include "domain/UBGraphicsPDFItem.h"
-
+#include "frameworks/UBFileSystemUtils.h"
 #include "pdf/PDFRenderer.h"
 
-
 #include "UBCFFSubsetAdaptor.h"
+#include "UBImportCFF.h"
 
 #include "quazip.h"
 #include "quazipfile.h"

src/adaptors/UBImportCFF.h

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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 UBIMPORTCFF_H
 #define UBIMPORTCFF_H