diff --git a/data/ui/LutrisWindow.ui b/data/ui/LutrisWindow.ui index 1059ae915..eb75a9bc6 100644 --- a/data/ui/LutrisWindow.ui +++ b/data/ui/LutrisWindow.ui @@ -11,13 +11,6 @@ False gtk-media-play - - True - False - 4 - 16 - view-grid-symbolic - True False @@ -25,6 +18,13 @@ 16 view-list-symbolic + + True + False + 4 + 16 + view-grid-symbolic + 640 300 @@ -99,30 +99,6 @@ - - - True - False - Import - True - - - True - False - - - True - False - Import games from ScummVM - ScummVM - True - - - - - - - gtk-quit diff --git a/lutris/gui/lutriswindow.py b/lutris/gui/lutriswindow.py index 10b78fc11..e4f9816f0 100644 --- a/lutris/gui/lutriswindow.py +++ b/lutris/gui/lutriswindow.py @@ -225,16 +225,6 @@ class LutrisWindow(object): def on_image_downloaded(self, game_slug): self.view.update_image(game_slug) - def import_scummvm(self, _widget, _data=None): - """Callback for importing scummvm games""" - from lutris.runners.scummvm import import_games - new_games = import_games() - if not new_games: - dialogs.NoticeDialog("No ScummVM games found") - else: - for new_game in new_games: - self.view.add_game(new_game) - def on_search_entry_changed(self, widget): self.view.emit('filter-updated', widget.get_text()) diff --git a/lutris/runners/scummvm.py b/lutris/runners/scummvm.py index c0d5490ee..9867f9292 100644 --- a/lutris/runners/scummvm.py +++ b/lutris/runners/scummvm.py @@ -25,51 +25,12 @@ import os import subprocess from lutris import settings -from lutris.util.log import logger -from lutris.util.strings import slugify from lutris.util.system import find_executable from lutris.runners.runner import Runner -from lutris.config import LutrisConfig -from ConfigParser import ConfigParser SCUMMVM_CONFIG_FILE = os.path.join(os.path.expanduser("~"), ".scummvmrc") -def add_game(game_id, realname): - """Add scummvm from the auto-import""" - lutris_config = LutrisConfig() - lutris_config.config = {"runner": "scummvm", - "realname": realname, - "name": slugify(realname), - 'game': { - 'game_id': game_id - }} - lutris_config.save("game") - - -def import_games(): - """Parse the scummvm config file and imports the games in Lutris config - files.""" - logger.info("Importing ScummVM games.") - imported_games = [] - if not os.path.exists(SCUMMVM_CONFIG_FILE): - logger.info("No ScummVM config found") - return None - config_parser = ConfigParser() - config_parser.read(SCUMMVM_CONFIG_FILE) - config_sections = config_parser.sections() - if "scummvm" in config_sections: - config_sections.remove("scummvm") - for section in config_sections: - realname = config_parser.get(section, "description") - logger.info("Found ScummVM game %s", realname) - add_game(section, realname) - imported_games.append({'id': slugify(realname), - 'name': realname, - 'runner': 'scummvm'}) - return imported_games - - # pylint: disable=C0103 class scummvm(Runner): """Runs LucasArts games based on the Scumm engine"""