From ddf400486f1454c9edba71cde7fdafae47238b5d Mon Sep 17 00:00:00 2001 From: Tannin Date: Mon, 14 Dec 2015 20:46:47 +0100 Subject: [PATCH] updated to use updated plugin api Conflicts: src/pyCfg.py --- src/pyCfg.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/pyCfg.py b/src/pyCfg.py index bf19e8d..0f53635 100644 --- a/src/pyCfg.py +++ b/src/pyCfg.py @@ -13,6 +13,7 @@ from PyQt5.QtWidgets import QDialog, QHeaderView, QMessageBox, QColorDialog, QTr if "mobase" not in sys.modules: import mock_mobase as mobase + class CaselessDict(dict): """Dictionary that enables case insensitive searching while preserving case sensitivity when keys are listed, ie, via keys() or items() methods. @@ -110,8 +111,8 @@ class MainWindow(QDialog): self.__save() elif res == QMessageBox.Cancel: event.ignore() - #else: - # super(MainWindow, self).__init__(event) + else: + super(MainWindow, self).closeEvent(event) def __save(self): self.saveSettings.emit(self.__settings) @@ -187,7 +188,6 @@ class MainWindow(QDialog): self.sender().setIcon(QtGui.QIcon(":/pyCfg/false")) # qt5 - # def __editBoxChanged(self, ignore): def __editBoxChanged(self): self.__valueChanged(self.sender(), str(self.sender().text())) @@ -357,7 +357,6 @@ class MainWindow(QDialog): self.__updateTree() - class MagicFile(file): def __init__(self, filename, mode): super(MagicFile, self).__init__(filename, mode) @@ -430,12 +429,14 @@ class IniEdit(mobase.IPluginTool): self.__parentWidget = widget def __iniFiles(self): - gameType = self.__organizer.gameInfo().type() - if str(gameType) == "oblivion": + gameName = self.__organizer.managedGame().gameShortName().lower() + if gameName == "oblivion": return ["oblivion.ini", "oblivionprefs.ini"] - elif str(gameType) == "fallout3" or str(gameType) == "falloutnv": + elif gameName == "fallout3" or gameName == "falloutnv": return ["fallout.ini", "falloutprefs.ini"] - elif str(gameType) == "skyrim": + elif gameName == "fallout4": + return ["fallout4.ini", "fallout4prefs.ini"] + elif gameName == "skyrim": return ["skyrim.ini", "skyrimprefs.ini"] elif str(gameType) == "fallout4": return ["fallout4.ini", "fallout4prefs.ini", "fallout4custom.ini"] @@ -444,7 +445,7 @@ class IniEdit(mobase.IPluginTool): def __filteredSettings(self): newSettings = CaselessDict() - gameName = str(self.__organizer.gameInfo().type()) + gameName = str(self.__organizer.managedGame().gameShortName()) iniFiles = self.__iniFiles()