gaming/lutris
gaming/lutris
1
0
Fork 0
mirror of https://github.com/lutris/lutris synced 2024-09-19 15:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge gui.util into gui.widgets.utils

Browse source
This commit is contained in:
Mathieu Comandon 2019-01-21 16:01:14 -08:00
parent 8d77fd7fe1
commit af0f850f4b
6 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lutris/game_actions.py
View file

@ -5,7 +5,7 @@ from gi.repository import Gio
from lutris.command import MonitoredCommand
from lutris.game import Game
from lutris.gui import dialogs
from lutris.gui.util import open_uri
from lutris.gui.widgets.utils import open_uri
from lutris.gui.config.add_game import AddGameDialog
from lutris.gui.config.edit_game import EditGameConfigDialog
from lutris.gui.installerwindow import InstallerWindow

2
lutris/gui/dialogs/__init__.py
View file

@ -3,7 +3,7 @@
import os
from lutris import api, pga, runtime, settings
from lutris.gui.util import open_uri
from lutris.gui.widgets.utils import open_uri
from lutris.gui.widgets.log_text_view import LogTextView
from lutris.util import datapath
from lutris.util.log import logger

3
lutris/gui/dialogs/runners.py
View file

@ -8,12 +8,11 @@ from lutris.util import datapath
from lutris import runners
from lutris import settings
from lutris.util.log import logger
from lutris.gui.util import open_uri
from lutris.gui.dialogs import ErrorDialog, GtkBuilderDialog
from lutris.gui.dialogs.download import DownloadDialog
from lutris.gui.dialogs.runner_install import RunnerInstallDialog
from lutris.gui.config.runner import RunnerConfigDialog
from lutris.gui.widgets.utils import get_icon, ICON_SIZE, get_builder_from_file
from lutris.gui.widgets.utils import get_icon, ICON_SIZE, get_builder_from_file, open_uri
def simple_downloader(url, destination, callback, callback_args=None):

3
lutris/gui/lutriswindow.py
View file

@ -22,7 +22,6 @@ from lutris.services import get_services_synced_at_startup, steam
from lutris.vendor.gi_composites import GtkTemplate
from lutris.gui.util import open_uri
from lutris.gui import dialogs
from lutris.gui.widgets.sidebar import SidebarListBox
from lutris.gui.widgets.services import SyncServiceWindow
@ -34,7 +33,7 @@ from lutris.gui.views.grid import GameGridView
from lutris.gui.views.menu import ContextualMenu
from lutris.gui.views.store import GameStore
from lutris.gui.views.game_panel import GamePanel, GenericPanel
from lutris.gui.widgets.utils import IMAGE_SIZES
from lutris.gui.widgets.utils import IMAGE_SIZES, open_uri
@GtkTemplate(ui=os.path.join(datapath.get(), "ui", "lutris-window.ui"))

9
lutris/gui/util.py
View file

@ -1,9 +0,0 @@
"""Various utilities using the GObject framework"""
from gi.repository import Gtk, Gdk
from lutris.util.system import reset_library_preloads
def open_uri(uri):
"""Opens a local or remote URI with the default application"""
reset_library_preloads()
Gtk.show_uri(None, uri, Gdk.CURRENT_TIME)

9
lutris/gui/widgets/utils.py
View file

@ -1,7 +1,8 @@
"""Various utilities using the GObject framework"""
import os
import array
from PIL import Image
from gi.repository import GdkPixbuf, GLib, Gtk, Gio
from gi.repository import GdkPixbuf, GLib, Gtk, Gio, Gdk
from lutris.util.log import logger
from lutris.util import datapath
@ -38,6 +39,12 @@ def get_main_window(widget):
return window
def open_uri(uri):
"""Opens a local or remote URI with the default application"""
system.reset_library_preloads()
Gtk.show_uri(None, uri, Gdk.CURRENT_TIME)
def get_pixbuf(image, size, fallback=None):
"""Return a pixbuf from file `image` at `size` or fallback to `fallback`"""
width, heigth = size