synchronize data with python-qt-live-coding

machinekoder · machinekoder · commit 83b1f2f10a1a · 2019-03-16T20:38:37.000+01:00
diff --git a/README.md b/README.md
@@ -7,7 +7,11 @@ In constrast to other live coding environments, this project is a live coding QM
 
 Integrating QML live coding into your application significantly boosts your HMI developers productivity. Compared to stand-alone solutions, this approach enables integration of C++ QML components without deploying them first.
 
-Additionally, it enabled customization of the live coding environemnt, including pre-loading of resource intensive QML components.
+Additionally, it enables customization of the live coding environemnt, including pre-loading of resource intensive QML components.
+
+**See also**
+
+* [python-qt-live-coding](https://github.com/machinekoder/python-qt-live-coding): The Python version of this project.
 
 ## Install
 
diff --git a/example/example b/example/example
diff --git a/example/live.qml b/example/live.qml
@@ -28,7 +28,7 @@ ApplicationWindow {
       windowSettings.screen = root.screen.serialNumber
   }
 
-  LiveCoding {
+  LiveCodingPanel {
     id: liveCoding
     anchors.fill: parent
   }
diff --git a/lib/LiveCodingPanel.qml b/lib/LiveCodingPanel.qml
@@ -134,8 +134,6 @@ Item {
             root.visibility = Window.AutomaticVisibility
           }
         }
-
-        Component.onCompleted: checked = root.visibility === Window.FullScreen
       }
 
       CheckBox {
@@ -149,8 +147,6 @@ Item {
             root.flags = root.flags & ~Qt.WindowStaysOnTopHint
           }
         }
-
-        Component.onCompleted: checked = root.flags & Qt.WindowStaysOnTopHint
       }
     }
 
@@ -215,4 +211,6 @@ Item {
     nameFilters: ["*.qmlc", "*.jsc", "*.pyc", ".#*", ".*", "__pycache__", "*___jb_tmp___", // PyCharm safe write
       "*___jb_old___"]
   }
+
+  // add additional components that should only be loaded once here.
 }
diff --git a/lib/cpp_qt_live_coding_plugin.cpp b/lib/cpp_qt_live_coding_plugin.cpp
@@ -16,7 +16,7 @@ static const struct {
     const char *type;
     int major, minor;
 } qmldir [] = {
-    { "LiveCoding", 1, 0 },
+    { "LiveCodingPanel", 1, 0 },
     { "FileSelectionDialog", 1, 0 },
 };
 
diff --git a/lib/qml.qrc b/lib/qml.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/com/machinekoder/live">
         <file>FileSelectionDialog.qml</file>
-        <file>LiveCoding.qml</file>
+        <file>LiveCodingPanel.qml</file>
     </qresource>
 </RCC>

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ ApplicationWindow {`
`28`	`28`	`windowSettings.screen = root.screen.serialNumber`
`29`	`29`	`}`
`30`	`30`
`31`		`- LiveCoding {`
	`31`	`+ LiveCodingPanel {`
`32`	`32`	`id: liveCoding`
`33`	`33`	`anchors.fill: parent`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,6 @@ Item {`
`134`	`134`	`root.visibility = Window.AutomaticVisibility`
`135`	`135`	`}`
`136`	`136`	`}`
`137`		`-`
`138`		`- Component.onCompleted: checked = root.visibility === Window.FullScreen`
`139`	`137`	`}`
`140`	`138`
`141`	`139`	`CheckBox {`
`@@ -149,8 +147,6 @@ Item {`
`149`	`147`	`root.flags = root.flags & ~Qt.WindowStaysOnTopHint`
`150`	`148`	`}`
`151`	`149`	`}`
`152`		`-`
`153`		`- Component.onCompleted: checked = root.flags & Qt.WindowStaysOnTopHint`
`154`	`150`	`}`
`155`	`151`	`}`
`156`	`152`
`@@ -215,4 +211,6 @@ Item {`
`215`	`211`	`nameFilters: [".qmlc", ".jsc", ".pyc", ".#", ".", "__pycache__", "___jb_tmp___", // PyCharm safe write`
`216`	`212`	`"*___jb_old___"]`
`217`	`213`	`}`
	`214`	`+`
	`215`	`+ // add additional components that should only be loaded once here.`
`218`	`216`	`}`