Merge pull request #286 from machinekoder/fixes1

Small set of fixes

Author: ArcEye

src/application/plugin/plugin.cpp

@@ -118,7 +118,7 @@ QString MachinekitApplicationPlugin::fileLocation() const
 bool MachinekitApplicationPlugin::isLoadedFromResource() const
 {
     // If one file is missing, it will load all the files from the resource
-    QFile file(baseUrl().toLocalFile() + "/ApplicationCore.qml");
+    QFile file(baseUrl().toLocalFile() + "/" + qmldir[0].type + ".qml");
     if (!file.exists())
         return true;
     return false;

src/applicationcontrols/plugin/plugin.cpp

@@ -151,7 +151,7 @@ QString MachinekitApplicationControlsPlugin::fileLocation() const
 bool MachinekitApplicationControlsPlugin::isLoadedFromResource() const
 {
     // If one file is missing, it will load all the files from the resource
-    QFile file(baseUrl().toLocalFile() + "/EstopAction.qml");
+    QFile file(baseUrl().toLocalFile() + "/" + qmldir[0].type + ".qml");
     if (!file.exists())
         return true;
     return false;

src/controls/plugin/plugin.cpp

@@ -105,7 +105,7 @@ QString MachinekitControlsPlugin::fileLocation() const
 bool MachinekitControlsPlugin::isLoadedFromResource() const
 {
     // If one file is missing, it will load all the files from the resource
-    QFile file(baseUrl().toLocalFile() + "/ColorPicker.qml");
+    QFile file(baseUrl().toLocalFile() + "/" + qmldir[0].type + ".qml");
     if (!file.exists())
         return true;
     return false;

src/halremotecontrols/plugin/plugin.cpp

@@ -98,7 +98,7 @@ QString MachinekitHalRemoteControlsPlugin::fileLocation() const
 bool MachinekitHalRemoteControlsPlugin::isLoadedFromResource() const
 {
     // If one file is missing, it will load all the files from the resource
-    QFile file(baseUrl().toLocalFile() + "/HalApplicationWindow.qml");
+    QFile file(baseUrl().toLocalFile() + "/" + qmldir[0].type + ".qml");
     if (!file.exists())
         return true;
     return false;

src/pathview/glview.cpp

@@ -554,15 +554,20 @@ void GLView::setupShaders()
     m_textSelectionModeLocation = m_textProgram->uniformLocation("selectionMode");
 }
 
-void GLView::setupWindow()
+bool GLView::setupWindow()
 {
+    if (!window()) {
+        return false;
+    }
     connect(window()->openglContext(), &QOpenGLContext::aboutToBeDestroyed,
             this, &GLView::cleanup, Qt::DirectConnection);
 
     QSurfaceFormat format = window()->format();
     format.setDepthBufferSize(24);
     format.setSamples(4);
     window()->setFormat(format);
+
+    return true;
 }
 
 void GLView::setupCylinder(GLfloat r2, QVector3D P2, GLfloat r1, QVector3D P1, int detail, ModelType type)
@@ -1637,9 +1642,11 @@ void GLView::sync()
 {
     if (!m_initialized)
     {
+        if (setupWindow() == false) {
+            return;
+        }
         initializeOpenGLFunctions();
         setupShaders();
-        setupWindow();
         setupVBOs();
         setupStack();
         m_initialized = true;

src/pathview/glview.h

@@ -395,7 +395,7 @@ private slots:
     void setupGenericVertexBuffer(ModelType type);
     void setupTextVertexBuffer();
     void setupShaders();
-    void setupWindow();
+    bool setupWindow();
     void setupCube();
     void setupCylinder(GLfloat originRadius, QVector3D originPoint, GLfloat endRadius, QVector3D endPoint, int detail, ModelType type);
     void setupSphere(int detail);

src/pathview/plugin/plugin.cpp

@@ -121,7 +121,7 @@ QString MachinekitPathViewPlugin::fileLocation() const
 bool MachinekitPathViewPlugin::isLoadedFromResource() const
 {
     // If one file is missing, it will load all the files from the resource
-    QFile file(baseUrl().toLocalFile() + "/PathView3D.qml");
+    QFile file(baseUrl().toLocalFile() + "/" + qmldir[0].type + ".qml");
     if (!file.exists())
         return true;
     return false;