diff --git a/sgbackup/gui/_app.py b/sgbackup/gui/_app.py index 11cc0ef..cc1b810 100644 --- a/sgbackup/gui/_app.py +++ b/sgbackup/gui/_app.py @@ -364,7 +364,7 @@ class GameView(Gtk.Box): steam = Steam() if steam.find_new_steamapps(): dialog = NewSteamAppsDialog(parent=self.get_root()) - dialog.connect('response',self._on_new_steamapps_dialog_response) + dialog.connect_after('response',self._on_new_steamapps_dialog_response) dialog.present() else: dialog = NoNewSteamAppsDialog(parent=self.get_root()) @@ -1401,7 +1401,7 @@ class Application(Gtk.Application): steam = Steam() if steam.find_new_steamapps(): dialog = NewSteamAppsDialog(self.appwindow) - dialog.connect('response',on_dialog_response) + dialog.connect_after('response',on_dialog_response) dialog.present() else: dialog = NoNewSteamAppsDialog(self.appwindow) diff --git a/sgbackup/gui/_steam.py b/sgbackup/gui/_steam.py index dd271d7..ab41897 100644 --- a/sgbackup/gui/_steam.py +++ b/sgbackup/gui/_steam.py @@ -22,7 +22,7 @@ from gi.repository.GObject import GObject,Property,Signal,BindingFlags import os from ..steam import Steam,SteamLibrary,SteamApp,IgnoreSteamApp,PLATFORM_LINUX,PLATFORM_MACOS,PLATFORM_WINDOWS -from ..game import GameManager,Game,SteamLinuxGame,SteamMacOSGame,SteamWindowsGame,SavegameType +from ..game import GameManager,Game,SteamGameData,SteamLinuxData,SteamMacOSData,SteamWindowsData,SavegameType from ._gamedialog import GameDialog class SteamLibrariesDialog(Gtk.Dialog): @@ -349,21 +349,16 @@ class NewSteamAppsDialog(Gtk.Dialog): if item.appid == data.appid: self.__listmodel.remove(i) - game = Game("Enter key",data.name,"") + game = Game("",data.name,"") + game.steam = SteamGameData(appid=data.appid) if PLATFORM_WINDOWS: - game.steam_windows = SteamWindowsGame(data.appid,"","",installdir=data.installdir) - game.steam_linux = SteamLinuxGame(data.appid,"","") - game.steam_macos = SteamMacOSGame(data.appid,"","") + game.steam.windows = SteamWindowsData("","",installdir=data.installdir) game.savegame_type = SavegameType.STEAM_WINDOWS elif PLATFORM_LINUX: - game.steam_linux = SteamLinuxGame(data.appid,"","",installdir=data.installdir) - game.steam_windows = SteamWindowsGame(data.appid,"","") - game.steam_macos = SteamMacOSGame(data.appid,"","") + game.steam.linux = SteamLinuxData("","",installdir=data.installdir) game.savegame_type = SavegameType.STEAM_LINUX elif PLATFORM_MACOS: - game.steam_macos = SteamMacOSGame(data.appid,"","",installdir=data.installdir) - game.steam_windows = SteamWindowsGame(data.appid,"","") - game.steam_macos = SteamMacOSGame(data.appid,"","") + game.steam.macos = SteamMacOSData("","",installdir=data.installdir) game.savegame_type = SavegameType.STEAM_MACOS gamedialog = GameDialog(self,game) diff --git a/sgbackup/logger.conf b/sgbackup/logger.conf index 4f994e5..202cc56 100644 --- a/sgbackup/logger.conf +++ b/sgbackup/logger.conf @@ -3,7 +3,7 @@ keys=root [handlers] keys=consoleHandler -#keys=consoleHanlder,fileHandler +#keys=consoleHandler,fileHandler [formatters] keys=consoleFormatter,fileFormatter diff --git a/sgbackup/settings.py b/sgbackup/settings.py index 3987fa5..5db9694 100644 --- a/sgbackup/settings.py +++ b/sgbackup/settings.py @@ -478,7 +478,7 @@ class Settings(GObject.GObject): "XDG_DOWLNLOAD_DIR": GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOWNLOAD), "XDG_PICTURES_DIR": GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_PICTURES), "XDG_MUSIC_DIR": GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC), - "XDG_DATA_DIR": GLib.get_user_data_dir(), + "XDG_DATA_HOME": GLib.get_user_data_dir(), }) ret.update(self.variables) return ret