Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

src/Gui/Assistant.cpp

@@ -33,6 +33,7 @@
 
 #include "Assistant.h"
 #include <Base/Console.h>
+#include <Base/FileInfo.h>
 #include <App/Application.h>
 
 using namespace Gui;
@@ -96,13 +97,20 @@ bool Assistant::startAssistant()
         QString exe = QString::fromUtf8(App::GetApplication().getExecutableName());
         QString doc = QString::fromUtf8(App::Application::getHelpDir().c_str());
         QString qhc = doc + exe.toLower() + QLatin1String(".qhc");
+
+        Base::FileInfo fi ( (const char*)qhc.toUtf8() );
+        if (!fi.isReadable()) {
+            QMessageBox::critical(0, QObject::tr("%1 Help").arg(exe),
+            QObject::tr("FreeCAD help files not found (%1). You might need to install the FreeCAD documentation package.").arg(qhc));
+            return false;
+        }
 
         static bool first = true;
         if (first) {
             Base::Console().Log("Help file at %s\n", (const char*)qhc.toUtf8());
             first = false;
-        }
-
+        }
+        
         QStringList args;
 
         args << QLatin1String("-collectionFile") << qhc

src/Mod/Arch/CMakeLists.txt

@@ -31,9 +31,7 @@ SET(Arch_SRCS
     ArchCutPlane.py
     ArchServer.py
     ArchMaterial.py
-    ArchMaterial.ui
     ArchSchedule.py
-    ArchSchedule.ui
 )
 SOURCE_GROUP("" FILES ${Arch_SRCS})