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

AddonManager: Misc fixes from forum feedback

Browse Source
This commit is contained in:
Yorik van Havre
2019-05-22 15:03:14 -03:00
parent bcfbd990a7
commit e7ca12e03b
1 changed files with 48 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/Mod/AddonManager/AddonManager.py
View File

@@ -193,6 +193,15 @@ def remove_directory_if_empty(dir):
os.rmdir(dir)
def restartFreeCAD():
"Shuts down and rstarts FreeCAD"
args = QtGui.QApplication.arguments()[1:]
if FreeCADGui.getMainWindow().close():
QtCore.QProcess.startDetached(QtGui.QApplication.applicationFilePath(),args)
class AddonsInstaller(QtGui.QDialog):
def __init__(self):
@@ -296,21 +305,22 @@ class AddonsInstaller(QtGui.QDialog):
if not thread.isFinished():
oktoclose = False
if oktoclose:
if hasattr(self,"install_worker"):
if hasattr(self,"install_worker") or hasattr(self,"addon_removed"):
m = QtGui.QMessageBox()
m.setWindowTitle(translate("AddonsInstaller","Addon manager"))
m.setText(translate("AddonsInstaller","You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later."))
m.setIcon(m.Warning)
m.setStandardButtons(m.Ok | m.Cancel)
m.setDefaultButton(m.Cancel)
ret = m.exec()
ret = m.exec_()
if ret == m.Ok:
shutil.rmtree(self.macro_repo_dir,onerror=self.remove_readonly)
# restart FreeCAD - https://richardstechnotes.com/2014/06/28/restarting-a-qt-app-programmatically/
args = QtGui.QApplication.arguments()[1:]
QtCore.QProcess.startDetached(QtGui.QApplication.applicationFilePath(),args)
QtCore.QCoreApplication.quit()
shutil.rmtree(self.macro_repo_dir,onerror=self.remove_readonly)
# restart FreeCAD after a delay to give time to close this dialog
QtCore.QTimer.singleShot(1000,restartFreeCAD)
try:
shutil.rmtree(self.macro_repo_dir,onerror=self.remove_readonly)
except:
pass
QtGui.QDialog.reject(self)
def retranslateUi(self):
@@ -353,7 +363,7 @@ class AddonsInstaller(QtGui.QDialog):
def add_addon_repo(self, addon_repo):
self.repos.append(addon_repo)
if addon_repo[2] == 1 :
self.listWorkbenches.addItem(QtGui.QListWidgetItem(QtGui.QIcon.fromTheme("dialog-ok",QtGui.QIcon(":/icons/edit_OK.svg")),str(addon_repo[0]) + str(" (Installed)")))
self.listWorkbenches.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/button_valid.svg"),str(addon_repo[0]) + str(" (Installed)")))
else:
self.listWorkbenches.addItem(" "+str(addon_repo[0]))
@@ -404,7 +414,7 @@ class AddonsInstaller(QtGui.QDialog):
else:
self.macros.append(macro)
if macro.is_installed():
self.listMacros.addItem(QtGui.QListWidgetItem(QtGui.QIcon.fromTheme('dialog-ok'), macro.name + str(' (Installed)')))
self.listMacros.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/button_valid.svg"), macro.name + str(' (Installed)')))
else:
self.listMacros.addItem(" "+macro.name)
@@ -432,6 +442,7 @@ class AddonsInstaller(QtGui.QDialog):
self.install_worker = InstallWorker(self.repos, idx)
self.install_worker.info_label.connect(self.set_information_label)
self.install_worker.progressbar_show.connect(self.show_progress_bar)
self.install_worker.mark_recompute.connect(self.mark_recompute)
self.install_worker.start()
elif self.tabWidget.currentIndex() == 1:
# Tab "Macros".
@@ -440,7 +451,6 @@ class AddonsInstaller(QtGui.QDialog):
self.labelDescription.setText(translate("AddonsInstaller", "Macro successfully installed. The macro is now available from the Macros dialog."))
else:
self.labelDescription.setText(translate("AddonsInstaller", "Unable to install"))
self.update_status(soft=True)
def show_progress_bar(self, state):
if state == True:
@@ -508,6 +518,21 @@ class AddonsInstaller(QtGui.QDialog):
else:
self.labelDescription.setText(translate('AddonsInstaller', 'Macro could not be removed.'))
self.update_status(soft=True)
self.addon_removed = True # A value to trigger the restart message
def mark_recompute(self,addon):
"marks an addon in the list as installed but needs recompute"
for i in range(self.listWorkbenches.count()):
txt = self.listWorkbenches.item(i).text().strip()
if txt.endswith(" (Installed)"):
txt = txt[:-12]
elif txt.endswith(" (Update available)"):
txt = txt[:-19]
if txt == addon:
self.listWorkbenches.item(i).setText(txt+" (Restart required)")
self.listWorkbenches.item(i).setIcon(QtGui.QIcon(":/icons/edit-undo.svg"))
def update_status(self,soft=False):
@@ -517,13 +542,18 @@ class AddonsInstaller(QtGui.QDialog):
if soft:
for i in range(self.listWorkbenches.count()):
txt = self.listWorkbenches.item(i).text().strip()
ext = ""
if txt.endswith(" (Installed)"):
txt = txt[:-12]
ext = " (Installed)"
elif txt.endswith(" (Update available)"):
txt = txt[:-19]
ext = " (Update available)"
elif txt.endswith(" (Restart required)"):
txt = txt[:-19]
ext = " (Restart required)"
if os.path.exists(os.path.join(moddir,txt)):
self.listWorkbenches.item(i).setText(txt+" (Installed)")
self.listWorkbenches.item(i).setIcon(QtGui.QIcon.fromTheme("dialog-ok"))
self.listWorkbenches.item(i).setText(txt+ext)
else:
self.listWorkbenches.item(i).setText(" "+txt)
self.listWorkbenches.item(i).setIcon(QtGui.QIcon())
@@ -534,8 +564,7 @@ class AddonsInstaller(QtGui.QDialog):
elif txt.endswith(" (Update available)"):
txt = txt[:-19]
if os.path.exists(os.path.join(moddir,txt)):
self.listMacros.item(i).setText(txt+" (Installed)")
self.listMacros.item(i).setIcon(QtGui.QIcon.fromTheme("dialog-ok"))
self.listMacros.item(i).setText(txt+ext)
else:
self.listMacros.item(i).setText(" "+txt)
self.listMacros.item(i).setIcon(QtGui.QIcon())
@@ -544,14 +573,14 @@ class AddonsInstaller(QtGui.QDialog):
self.listMacros.clear()
for wb in self.repos:
if os.path.exists(os.path.join(moddir,wb[0])):
self.listWorkbenches.addItem(QtGui.QListWidgetItem(QtGui.QIcon.fromTheme("dialog-ok"),str(wb[0]) + str(" (Installed)")))
self.listWorkbenches.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/button_valid.svg"),str(wb[0]) + str(" (Installed)")))
wb[2] = 1
else:
self.listWorkbenches.addItem(" "+str(wb[0]))
wb[2] = 0
for macro in self.macros:
if macro.is_installed():
self.listMacros.addItem(QtGui.QListWidgetItem(QtGui.QIcon.fromTheme('dialog-ok'), macro.name + str(' (Installed)')))
self.listMacros.addItem(QtGui.QListWidgetItem(QtGui.QIcon(":/icons/button_valid.svg"), macro.name + str(' (Installed)')))
else:
self.listMacros.addItem(" "+macro.name)
@@ -560,7 +589,7 @@ class AddonsInstaller(QtGui.QDialog):
w = self.listWorkbenches.item(i)
if w.text().startswith(str(repo)):
w.setText(str(repo) + str(" (Update available)"))
w.setIcon(QtGui.QIcon.fromTheme("reload"))
w.setIcon(QtGui.QIcon(":/icons/view-refresh.svg"))
if not repo in self.doUpdate:
self.doUpdate.append(repo)
@@ -906,6 +935,7 @@ class InstallWorker(QtCore.QThread):
info_label = QtCore.Signal(str)
progressbar_show = QtCore.Signal(bool)
mark_recompute = QtCore.Signal(str)
def __init__(self, repos, idx):
QtCore.QThread.__init__(self)
@@ -1000,6 +1030,7 @@ class InstallWorker(QtCore.QThread):
answer += f + "</b>"
self.progressbar_show.emit(False)
self.info_label.emit(answer)
self.mark_recompute.emit(self.repos[idx][0])
self.stop = True
def checkDependencies(self,baseurl):