Implemented compatablility import of glabels-3 project files (#39).

jimevins · Dec 2, 2018 · ba3c602 · ba3c602
1 parent 1cdb397
commit ba3c602
Show file tree

Hide file tree

Showing 28 changed files with 2,495 additions and 3 deletions.
diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
@@ -455,6 +455,7 @@ namespace glabels
 					loadTextPage();
 					loadPositionPage();
 					loadShadowPage();
+                                        loadRectSizePage();
 
 					setEnabled( true );
 				}

diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt
@@ -58,6 +58,7 @@ set (Model_sources
   XmlCategoryParser.cpp
   XmlLabelCreator.cpp
   XmlLabelParser.cpp
+  XmlLabelParser_3.cpp
   XmlPaperParser.cpp
   XmlTemplateCreator.cpp
   XmlTemplateParser.cpp

diff --git a/model/Distance.cpp b/model/Distance.cpp
@@ -208,3 +208,9 @@ namespace glabels
 
 	}
 }
+QDebug operator<<(QDebug dbg, const glabels::model::Distance &dist)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace() << dist.toString(glabels::model::Units::Enum::MM);
+    return dbg.maybeSpace();
+}
diff --git a/model/Template.cpp b/model/Template.cpp
@@ -43,7 +43,6 @@ namespace glabels
 			  mPaperId(paperId),
 			  mPageWidth(pageWidth),
 			  mPageHeight(pageHeight),
-			  mIsUserDefined(isUserDefined),
 			  mIsSizeIso(false),
 			  mIsSizeUs(false),
 			  mName("")

diff --git a/model/XmlLabelParser.cpp b/model/XmlLabelParser.cpp
@@ -32,6 +32,8 @@
 #include "XmlUtil.h"
 #include "DataCache.h"
 
+#include "XmlLabelParser_3.h"
+
 #include "barcode/Backends.h"
 #include "merge/Factory.h"
 
@@ -77,7 +79,7 @@ namespace glabels
 				gunzip( rawData, unzippedData );
 				success = doc.setContent( unzippedData, false, &errorString, &errorLine, &errorColumn );
 #else
-				qWarning() << "Warning: Cannot read compressed glabels project file!  gLabels not build with ZLIB.";
+				qWarning() << "Warning: Cannot read compressed glabels project file!  gLabels not built with ZLIB.";
 				return nullptr;
 #endif
 			}
@@ -239,7 +241,8 @@ namespace glabels
 			QString version = XmlUtil::getStringAttr( node, "version", "" );
 			if ( version != "4.0" )
 			{
-				qWarning() << "TODO: compatibility mode.";
+				// Attempt to import as version 3.0 format (glabels 2.0 - glabels 3.4)
+				return XmlLabelParser_3::parseRootNode(node);
 			}
 
 			auto* label = new Model();