Merge branch 'master' into terminal_strip

* master:
  Fix crash
  Change displayed version on master
  avoid WARNING: mime_xml.path is not defined
  Update changelog

ChangeLog

@@ -1,3 +1,54 @@
+====== ChangeLog from 0.8 to 0.9 ======
+
+
+*Diagram editor :
+Improved QElectroTech speed (launch qet, open project, function)
+A drop-down list has been added to the toolbar to change the size of the resize handles.
+
+
+*Element Editor:
+The "keep visual rotation" property of element texts is editable from the element editor.
+Thanks to the work of antonioaja it is now possible to import a dxf directly from the element editor in a completely transparent way for the user.
+In the background QElectroTech uses the dxf2elmt software. https://qelectrotech.org/forum/viewtopic.php?id=2265 https://github.com/antonioaja/dxf2elmt
+Improved responsiveness when multiple shapes are selected or deleted, especially when working on a large converted DXF element.
+https://qelectrotech.org/forum/viewtopic.php?pid=16612#p16612
+
+*Other:
+Add a "side project" tab in the "about" window.
+In the general QElectroTech configuration, a drop down list allows to choose the scaling method for hdpi screens.
+Allow open polygons (i.e. polylines) when saving in dxf format.
+https://qelectrotech.org/forum/viewtopic.php?pid=16611#p16611
+
+Added 'Other' option for slave device contact type.
+https://github.com/qelectrotech/qelectrotech-source-mirror/pull/222
+https://qelectrotech.org/forum/viewtopic.php?id=2264
+
+*Logs:
+
+Added a QElapsedTimer to calculate the time used to reload the item collection.
+Improved QElapsedTimer to calculate the time used to reload the item collection in seconds instead of ms.
+Added Linux pc.gpu.RAM information, but requires mesa-utils dependency on the Linux OS.
+Added information about mounted disk volumes.
+Added CPU architecture for which Qt was compiled in the aboutqetdialog widget and in the logs.
+Added MSVC support to MachineInfo.
+Added RAM information on Windows of available RAM.
+Added QElectroTech version to the log file.
+
+
+
+* Elements collection :
+Improve collection 8274 elements in 1097 categories (i.e. 9371 files).
+
+
+
+* macOS :
+Fix sqlite3 database export on macOS, now I use macports with Digikam scripts instead off Homebrew Package Manager.
+See: https://invent.kde.org/graphics/digikam/-/tree/master/project/bundles/macports
+
+
+*Bug fix:
+see: https://git.tuxfamily.org/qet/qet.git/log/?h=0.8.1
+
 ====== ChangeLog from 0.7 to 0.8 ======
 
 

qelectrotech.pro

@@ -298,7 +298,7 @@ man.extra          = sh man/compress_man_pages.sh
 INSTALLS += target elements tbt lang copyright
 # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
 unix {
-        INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples appdata
+        INSTALLS += desktop mime_package icons man examples appdata
 }
 
 # Options de compilation communes a Unix et MacOS X

sources/TerminalStrip/GraphicsItem/terminalstripitem.cpp

@@ -106,6 +106,7 @@ void TerminalStripItem::refreshPending()
         for (const auto &strip_ : diagram()->project()->terminalStrip()) {
             if (strip_->uuid() == m_pending_strip_uuid) {
                 setTerminalStrip(strip_);
+                m_pending_strip_uuid = QUuid();
                 break;
             }
         }

sources/diagram.cpp

@@ -924,12 +924,14 @@ QDomDocument Diagram::toXml(bool whole_content) {
 				auto table = static_cast<QetGraphicsTableItem *>(qgi);
 				if (whole_content || table->isSelected())
 					table_vector << table;
+                break;
 			}
             case TerminalStripItem::Type: {
                 const auto strip = static_cast<TerminalStripItem *>(qgi);
                 if (whole_content || strip->isSelected()) {
                     strip_vector << strip;
                 }
+                break;
             }
 		}
 	}

sources/qet.h

@@ -29,9 +29,9 @@ class QActionGroup;
 */
 namespace QET {
 	/// QElectroTech version (as string, used to mark projects and elements XML documents)
-	const QString version = "0.90";
+	const QString version = "0.100";
 	/// QElectroTech displayed version
-	const QString displayedVersion = "0.90-DEV";
+	const QString displayedVersion = "0.100-DEV";
 	QString license();
 	
 		//Describe the current state of a graphic item

sources/xml/terminalstripitemxml.cpp

@@ -38,8 +38,12 @@ const QString STRIP_ITEMS_TAG_NAME { QStringLiteral("terminal_strip_items") };
 QDomElement TerminalStripItemXml::toXml(const QVector<TerminalStripItem *> &items, QDomDocument &document)
 {
     auto dom_element = document.createElement(STRIP_ITEMS_TAG_NAME);
-    for (const auto &item : items) {
+    for (const auto &item : items)
-        dom_element.appendChild(toXml(item, document));
+    {
+        const auto child_ = toXml(item, document);
+        if (!child_.isNull()) {
+            dom_element.appendChild(child_);
+        }
     }
 
     return dom_element;
@@ -76,20 +80,25 @@ QVector<TerminalStripItem *> TerminalStripItemXml::fromXml(Diagram *diagram, con
  * Save @a item to an xml element with tag "terminal_strip_item"
  * @param item : item to save in xml
  * @param document : parent document used to create the QDomElement returned by this function.
- * @return QDomElement where are saved @a item.
+ * @return QDomElement where are saved @a item, note that the returned QDomElement can be null.
  */
 QDomElement TerminalStripItemXml::toXml(TerminalStripItem *item, QDomDocument &document)
 {
+    if (item->terminalStrip())
+    {
         //Terminal strip item dom element
-    auto dom_element = document.createElement(STRIP_ITEM_TAG_NAME);
+        auto dom_element = document.createElement(STRIP_ITEM_TAG_NAME);
 
-    auto dom_strip = document.createElement(QStringLiteral("terminal_strip"));
+        auto dom_strip = document.createElement(QStringLiteral("terminal_strip"));
-    dom_strip.setAttribute(QStringLiteral("uuid"), item->terminalStrip()->uuid().toString());
+        dom_strip.setAttribute(QStringLiteral("uuid"), item->terminalStrip()->uuid().toString());
-    dom_element.appendChild(dom_strip);
+        dom_element.appendChild(dom_strip);
 
-    dom_element.appendChild(QETXML::qGraphicsItemPosToXml(item, document));
+        dom_element.appendChild(QETXML::qGraphicsItemPosToXml(item, document));
 
-    return dom_element;
+        return dom_element;
+    } else {
+        return QDomElement();
+    }
 }
 
 /**