mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

debug-viewer: use the gi GLib version rather than the old gobject glib package

Browse source
This commit is contained in:
Philippe Normand 2016-01-14 12:21:34 +01:00 committed by Stefan Sauer
parent ae13b16205
commit 66a6d948a6
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
debug-viewer/GstDebugViewer/GUI/columns.py
View file

@ -24,8 +24,7 @@ def _ (s):
import logging import logging
import glib from gi.repository import Gtk, GLib
from gi.repository import Gtk
from GstDebugViewer import Common, Data from GstDebugViewer import Common, Data
from GstDebugViewer.GUI.colors import LevelColorThemeTango from GstDebugViewer.GUI.colors import LevelColorThemeTango
@ -347,13 +346,13 @@ class MessageColumn (TextColumn):
end = None end = None
for start, end in ranges: for start, end in ranges:
if prev_end < start: if prev_end < start:
tags.append (glib.markup_escape_text (msg[prev_end:start])) tags.append (GLib.markup_escape_text (msg[prev_end:start]))
msg_escape = glib.markup_escape_text (msg[start:end]) msg_escape = GLib.markup_escape_text (msg[start:end])
tags.append ("<span foreground=\'#FFFFFF\'" tags.append ("<span foreground=\'#FFFFFF\'"
" background=\'#0000FF\'>%s</span>" % (msg_escape,)) " background=\'#0000FF\'>%s</span>" % (msg_escape,))
prev_end = end prev_end = end
if end is not None: if end is not None:
tags.append (glib.markup_escape_text (msg[end:])) tags.append (GLib.markup_escape_text (msg[end:]))
cell.props.markup = "".join (tags) cell.props.markup = "".join (tags)
return message_data_func return message_data_func

6
debug-viewer/GstDebugViewer/GUI/window.py
View file

@ -28,10 +28,10 @@ import os.path
from bisect import bisect_right, bisect_left from bisect import bisect_right, bisect_left
import logging import logging
import glib
from gi.repository import GObject from gi.repository import GObject
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import Gdk from gi.repository import Gdk
from gi.repository import GLib
from GstDebugViewer import Common, Data, Main from GstDebugViewer import Common, Data, Main
from GstDebugViewer.GUI.columns import LineViewColumnManager, ViewColumnManager from GstDebugViewer.GUI.columns import LineViewColumnManager, ViewColumnManager
@ -850,8 +850,8 @@ class Window (object):
bar.props.message_type = Gtk.MessageType.ERROR bar.props.message_type = Gtk.MessageType.ERROR
box = bar.get_content_area () box = bar.get_content_area ()
markup = "<b>%s</b> %s" % (glib.markup_escape_text (message1), markup = "<b>%s</b> %s" % (GLib.markup_escape_text (message1),
glib.markup_escape_text (message2),) GLib.markup_escape_text (message2),)
label = Gtk.Label () label = Gtk.Label ()
label.props.use_markup = True label.props.use_markup = True
label.props.label = markup label.props.label = markup

5
debug-viewer/GstDebugViewer/Plugins/FindBar.py
View file

@ -24,8 +24,7 @@ import logging
from GstDebugViewer import Common, Data, GUI from GstDebugViewer import Common, Data, GUI
from GstDebugViewer.Plugins import * from GstDebugViewer.Plugins import *
import glib from gi.repository import GObject, GLib
from gi.repository import GObject
from gi.repository import Gtk from gi.repository import Gtk
class SearchOperation (object): class SearchOperation (object):
@ -183,7 +182,7 @@ class FindBarWidget (Gtk.HBox):
def __set_status (self, text): def __set_status (self, text):
markup = "<b>%s</b>" % (glib.markup_escape_text (text),) markup = "<b>%s</b>" % (GLib.markup_escape_text (text),)
self.status_label.props.label = markup self.status_label.props.label = markup