kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Start] Fix regression from 2b6662c896

Browse Source 
for runtime error see https://github.com/FreeCAD/FreeCAD/pull/11513#issuecomment-1837300296
This commit is contained in:
Syres916
2023-12-03 14:48:35 +00:00
committed by Yorik van Havre
parent 7f10321a29
commit 5677f93236
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Mod/Start/Gui/Workbench.cpp
View File

@@ -76,7 +76,7 @@ void StartGui::Workbench::loadStartPage()
std::string escapedstr = Base::Tools::escapedUnicodeFromUtf8(utf8Title);
std::stringstream str;
str << "import WebGui,sys,Start\n"
<< "from PySide import QtCore\n"
<< "from PySide import QtCore, QtGui\n"
<< "from StartPage import StartPage\n\n"
<< "class WebPage(object):\n"
<< " def __init__(self):\n"
@@ -95,14 +95,25 @@ void StartGui::Workbench::loadStartPage()
<< " except RuntimeError as e:\n"
<< " pass\n"
<< " def reload(self):\n"
<< " startOpen = False\n"
<< " title = QtGui.QApplication.translate('Workbench', 'Start page')\n"
<< " mw = FreeCADGui.getMainWindow()\n"
<< " if mw:\n"
<< " mdi = mw.findChild(QtGui.QMdiArea)\n"
<< " if mdi:\n"
<< " for mdichild in mdi.children():\n"
<< " for subw in mdichild.findChildren(QtGui.QMdiSubWindow):\n"
<< " if subw.windowTitle() == title:\n"
<< " startOpen = True\n"
<< " if startOpen:\n" // if the user has closeStart set to True a Runtime Error
// is raised if a simple Preferences change is made
#if defined(FC_OS_WIN32)
<< " self.browser.setHtml(StartPage.handle(), App.getResourceDir() + "
<< " self.browser.setHtml(StartPage.handle(), App.getResourceDir() + "
"'Mod/Start/StartPage/')\n\n"
#else
<< " self.browser.setHtml(StartPage.handle(), 'file://' + "
<< " self.browser.setHtml(StartPage.handle(), 'file://' + "
"App.getResourceDir() + 'Mod/Start/StartPage/')\n\n"
#endif
<< "class WebView(object):\n"
<< " def __init__(self):\n"
<< " self.pargrp = FreeCAD.ParamGet('User "