[gnome-dvb-daemon] Use GObject instead of gobject module
- From: Sebastian Polsterl <sebp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-dvb-daemon] Use GObject instead of gobject module
- Date: Mon, 15 Aug 2011 09:56:22 +0000 (UTC)
commit db9a364c763e33a685d91382f960dc67fa4d17f2
Author: Sebastian PÃlsterl <sebp k-d-w org>
Date: Mon Aug 15 11:41:06 2011 +0200
Use GObject instead of gobject module
client/gnomedvb/DBusWrapper.py | 52 ++++++++++----------
.../channellisteditor/ChannelListEditorDialog.py | 4 +-
.../ui/controlcenter/ControlCenterWindow.py | 8 ++--
client/gnomedvb/ui/preferences/DeviceGroupsView.py | 8 ++--
client/gnomedvb/ui/preferences/Dialogs.py | 4 +-
client/gnomedvb/ui/preferences/Preferences.py | 4 +-
client/gnomedvb/ui/timers/EditTimersDialog.py | 4 +-
client/gnomedvb/ui/widgets/CellRendererDatetime.py | 12 ++--
client/gnomedvb/ui/widgets/ChannelGroupsView.py | 4 +-
client/gnomedvb/ui/widgets/ChannelsStore.py | 8 ++--
client/gnomedvb/ui/widgets/ChannelsView.py | 4 +-
client/gnomedvb/ui/widgets/DateTime.py | 12 ++--
client/gnomedvb/ui/widgets/Frame.py | 6 +-
client/gnomedvb/ui/widgets/HelpBox.py | 4 +-
client/gnomedvb/ui/widgets/RecordingsStore.py | 4 +-
client/gnomedvb/ui/widgets/RecordingsView.py | 4 +-
client/gnomedvb/ui/widgets/RunningNextView.py | 6 +-
client/gnomedvb/ui/widgets/SchedulePaned.py | 4 +-
client/gnomedvb/ui/widgets/ScheduleStore.py | 6 +-
client/gnomedvb/ui/widgets/ScheduleView.py | 4 +-
client/gnomedvb/ui/wizard/SetupWizard.py | 6 +-
client/gnomedvb/ui/wizard/pages/AdaptersPage.py | 10 ++--
client/gnomedvb/ui/wizard/pages/BasePage.py | 4 +-
client/gnomedvb/ui/wizard/pages/ChannelScanPage.py | 10 ++--
.../ui/wizard/pages/InitialTuningDataPage.py | 6 +-
.../ui/wizard/pages/SaveChannelListPage.py | 4 +-
client/gnomedvb/ui/wizard/pages/SetupDevicePage.py | 8 ++--
client/totem-plugin/dvb-daemon.py | 6 +-
28 files changed, 108 insertions(+), 108 deletions(-)
---
diff --git a/client/gnomedvb/DBusWrapper.py b/client/gnomedvb/DBusWrapper.py
index 583be6b..002ea0a 100644
--- a/client/gnomedvb/DBusWrapper.py
+++ b/client/gnomedvb/DBusWrapper.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
import gst
import re
import sys
@@ -99,15 +99,15 @@ def _get_proxy(object_path, iface_name):
object_path,
iface_name, None)
-class DVBManagerClient(gobject.GObject):
+class DVBManagerClient(GObject.GObject):
__gsignals__ = {
- "group-added": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int]),
- "group-removed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int]),
+ "group-added": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int]),
+ "group-removed": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int]),
}
def __init__(self):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.manager = _get_proxy(MANAGER_PATH, MANAGER_IFACE)
self.manager.connect("g-signal", self.on_g_signal)
@@ -169,15 +169,15 @@ class DVBManagerClient(gobject.GObject):
elif signal_name == "GroupRemoved":
self.emit("group-removed", params[0])
-class DVBDeviceGroupClient(gobject.GObject):
+class DVBDeviceGroupClient(GObject.GObject):
__gsignals__ = {
- "device-added": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, int]),
- "device-removed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, int]),
+ "device-added": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int, int]),
+ "device-removed": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int, int]),
}
def __init__(self, objpath):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
elements = objpath.split("/")
@@ -235,18 +235,18 @@ class DVBDeviceGroupClient(gobject.GObject):
elif signal_name == "DeviceRemoved":
self.emit("device-removed", *params)
-class DVBScannerClient(gobject.GObject):
+class DVBScannerClient(GObject.GObject):
__gsignals__ = {
- "finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
- "frequency-scanned": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, int]),
- "channel-added": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, int, str, str, str, bool]),
- "destroyed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
- "frontend-stats": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [float, float]),
+ "finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
+ "frequency-scanned": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int, int]),
+ "channel-added": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int, int, str, str, str, bool]),
+ "destroyed": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
+ "frontend-stats": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [float, float]),
}
def __init__(self, objpath, scanner_iface):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.scanner = _get_proxy(objpath, scanner_iface)
self.scanner.connect("g-signal", self.on_g_signal)
@@ -282,14 +282,14 @@ class DVBScannerClient(gobject.GObject):
elif signal_name == "FrontendStats":
self.emit("frontend-stats", *params)
-class DVBRecordingsStoreClient(gobject.GObject):
+class DVBRecordingsStoreClient(GObject.GObject):
__gsignals__ = {
- "changed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, int]),
+ "changed": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int, int]),
}
def __init__(self):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.recstore = _get_proxy(RECSTORE_PATH, RECSTORE_IFACE)
self.recstore.connect("g-signal", self.on_g_signal)
@@ -329,16 +329,16 @@ class DVBRecordingsStoreClient(gobject.GObject):
if signal_name == "Changed":
self.emit("changed", *params)
-class DVBRecorderClient(gobject.GObject):
+class DVBRecorderClient(GObject.GObject):
__gsignals__ = {
- "recording-started": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int]),
- "recording-finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int]),
- "changed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, int]),
+ "recording-started": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int]),
+ "recording-finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int]),
+ "changed": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int, int]),
}
def __init__(self, object_path):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.recorder = _get_proxy(object_path, RECORDER_IFACE)
self.recorder.connect("g-signal", self.on_g_signal)
@@ -449,10 +449,10 @@ class DVBChannelListClient:
def remove_channel_from_group(self, cid, group_id, **kwargs):
return self.channels.RemoveChannelFromGroup('(ui)', cid, group_id, **kwargs)
-class DVBScheduleClient(gobject.GObject):
+class DVBScheduleClient(GObject.GObject):
def __init__(self, object_path):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
# "/org/gnome/DVB/DeviceGroup/%u/Schedule/%u";
elements = object_path.split("/")
diff --git a/client/gnomedvb/ui/channellisteditor/ChannelListEditorDialog.py b/client/gnomedvb/ui/channellisteditor/ChannelListEditorDialog.py
index 81a9c70..7d0bdb1 100644
--- a/client/gnomedvb/ui/channellisteditor/ChannelListEditorDialog.py
+++ b/client/gnomedvb/ui/channellisteditor/ChannelListEditorDialog.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
import gnomedvb
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gettext import gettext as _
from gnomedvb.ui.widgets.ChannelsStore import ChannelsStore
@@ -83,7 +83,7 @@ class ChannelListEditorDialog(Gtk.Dialog):
groups_buttonbox.pack_start(self.del_group_button, True, True, 0)
# device groups
- self.devgroupslist = Gtk.ListStore(str, int, gobject.GObject)
+ self.devgroupslist = Gtk.ListStore(str, int, GObject.GObject)
self.devgroupscombo = Gtk.ComboBox.new_with_model_and_entry(self.devgroupslist)
self.devgroupscombo.connect("changed", self.on_devgroupscombo_changed)
diff --git a/client/gnomedvb/ui/controlcenter/ControlCenterWindow.py b/client/gnomedvb/ui/controlcenter/ControlCenterWindow.py
index 9389336..d5607ca 100644
--- a/client/gnomedvb/ui/controlcenter/ControlCenterWindow.py
+++ b/client/gnomedvb/ui/controlcenter/ControlCenterWindow.py
@@ -18,7 +18,7 @@
from gi.repository import Gdk
from gi.repository import Gtk
-import gobject
+from gi.repository import GObject
from gettext import gettext as _
import gnomedvb
from gnomedvb.ui.widgets.ChannelsStore import ChannelsStore
@@ -37,7 +37,7 @@ from gnomedvb.ui.recordings.RecordingsDialog import RecordingsDialog
class ControlCenterWindow(Gtk.Window):
def __init__(self, model):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.runningnextstore = None
self.scrolledrunningnext = None
@@ -74,7 +74,7 @@ class ControlCenterWindow(Gtk.Window):
self.vbox_left = Gtk.VBox(spacing=6)
self.hpaned.pack1(self.vbox_left)
- self.devgroupslist = Gtk.ListStore(str, int, gobject.GObject)
+ self.devgroupslist = Gtk.ListStore(str, int, GObject.GObject)
self.devgroupslist.connect("row-inserted", self._on_devgroupslist_inserted)
self.devgroupscombo = Gtk.ComboBox.new_with_model_and_entry(self.devgroupslist)
@@ -417,7 +417,7 @@ class ControlCenterWindow(Gtk.Window):
def _on_devgroupslist_inserted(self, model, path, aiter):
if len(model) == 1:
# Delay the call otherwise we get DBus errors
- gobject.timeout_add(100, self._select_first_group)
+ GObject.timeout_add(100, self._select_first_group)
def _on_channel_selected(self, treeselection):
model, aiter = treeselection.get_selected()
diff --git a/client/gnomedvb/ui/preferences/DeviceGroupsView.py b/client/gnomedvb/ui/preferences/DeviceGroupsView.py
index c251bb6..ea09d10 100644
--- a/client/gnomedvb/ui/preferences/DeviceGroupsView.py
+++ b/client/gnomedvb/ui/preferences/DeviceGroupsView.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
from gi.repository import Gtk
-import gobject
+from gi.repository import GObject
from gettext import gettext as _
from gnomedvb.Device import Device
@@ -28,7 +28,7 @@ class UnassignedDevicesStore (Gtk.ListStore):
(COL_DEVICE,) = range(1)
def __init__(self):
- Gtk.ListStore.__init__(self, gobject.TYPE_PYOBJECT)
+ Gtk.ListStore.__init__(self, GObject.TYPE_PYOBJECT)
class DeviceGroupsStore (Gtk.TreeStore):
@@ -36,7 +36,7 @@ class DeviceGroupsStore (Gtk.TreeStore):
(COL_GROUP, COL_DEVICE,) = range(2)
def __init__(self):
- Gtk.TreeStore.__init__(self, gobject.GObject, gobject.TYPE_PYOBJECT)
+ Gtk.TreeStore.__init__(self, GObject.GObject, GObject.TYPE_PYOBJECT)
def get_groups(self):
groups = []
@@ -49,7 +49,7 @@ class DeviceGroupsStore (Gtk.TreeStore):
class DeviceGroupsView (Gtk.TreeView):
def __init__(self, model):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.set_model(model)
self.set_headers_visible(False)
#self.set_reorderable(True)
diff --git a/client/gnomedvb/ui/preferences/Dialogs.py b/client/gnomedvb/ui/preferences/Dialogs.py
index a7d5a63..840d87a 100644
--- a/client/gnomedvb/ui/preferences/Dialogs.py
+++ b/client/gnomedvb/ui/preferences/Dialogs.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
from gi.repository import Gtk
-import gobject
+from gi.repository import GObject
from gettext import gettext as _
from gnomedvb.ui.widgets.Frame import BaseFrame, TextFieldLabel
@@ -51,7 +51,7 @@ class AddToGroupDialog (Gtk.Dialog):
group_label.set_markup_with_mnemonic(_("_Group:"))
groupbox.pack_start(group_label, False, False, 0)
- self.groups = Gtk.ListStore(str, gobject.TYPE_PYOBJECT)
+ self.groups = Gtk.ListStore(str, GObject.TYPE_PYOBJECT)
combo = Gtk.ComboBox.new_with_model(self.groups)
combo.connect("changed", self.on_combo_changed)
diff --git a/client/gnomedvb/ui/preferences/Preferences.py b/client/gnomedvb/ui/preferences/Preferences.py
index d3cefc9..bf64c37 100644
--- a/client/gnomedvb/ui/preferences/Preferences.py
+++ b/client/gnomedvb/ui/preferences/Preferences.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
import subprocess
from gnomedvb import global_error_handler
@@ -34,7 +34,7 @@ class Preferences(Gtk.Window):
BUTTON_PREFERENCES,) = range(4)
def __init__(self, model, parent=None):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.set_title(_('Digital TV Preferences'))
if parent:
diff --git a/client/gnomedvb/ui/timers/EditTimersDialog.py b/client/gnomedvb/ui/timers/EditTimersDialog.py
index 0a76a03..1789bd7 100644
--- a/client/gnomedvb/ui/timers/EditTimersDialog.py
+++ b/client/gnomedvb/ui/timers/EditTimersDialog.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gettext import gettext as _
import datetime
@@ -63,7 +63,7 @@ class EditTimersDialog(Gtk.Dialog):
self.main_box.show()
self.get_content_area().pack_start(self.main_box, True, True, 0)
- self.timerslist = Gtk.ListStore(long, str, str, gobject.TYPE_PYOBJECT, long, bool)
+ self.timerslist = Gtk.ListStore(long, str, str, GObject.TYPE_PYOBJECT, long, bool)
self.timerslist.set_sort_func(self.COL_START,
self._datetime_sort_func)
diff --git a/client/gnomedvb/ui/widgets/CellRendererDatetime.py b/client/gnomedvb/ui/widgets/CellRendererDatetime.py
index 6ad75de..d0ee400 100644
--- a/client/gnomedvb/ui/widgets/CellRendererDatetime.py
+++ b/client/gnomedvb/ui/widgets/CellRendererDatetime.py
@@ -16,23 +16,23 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
class CellRendererDatetime(Gtk.CellRendererText):
__gproperties__ = {
- 'datetime' : (gobject.TYPE_PYOBJECT, 'datetime to display',
+ 'datetime' : (GObject.TYPE_PYOBJECT, 'datetime to display',
'Must be a Python datetime.datetime object',
- gobject.PARAM_READWRITE),
- 'format' : (gobject.TYPE_STRING,
+ GObject.PARAM_READWRITE),
+ 'format' : (GObject.TYPE_STRING,
'Specifies in which format the datetime should be displayed.',
'Accepts any strftime format string.',
- "%c", gobject.PARAM_READWRITE),
+ "%c", GObject.PARAM_READWRITE),
}
def __init__(self):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self._datetime = None
self._format = "%c"
self.set_property("text", "")
diff --git a/client/gnomedvb/ui/widgets/ChannelGroupsView.py b/client/gnomedvb/ui/widgets/ChannelGroupsView.py
index c0039e5..bc5db6f 100644
--- a/client/gnomedvb/ui/widgets/ChannelGroupsView.py
+++ b/client/gnomedvb/ui/widgets/ChannelGroupsView.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gettext import gettext as _
from gnomedvb.ui.widgets.ChannelGroupsStore import ChannelGroupsStore
@@ -24,7 +24,7 @@ from gnomedvb.ui.widgets.ChannelGroupsStore import ChannelGroupsStore
class ChannelGroupsView(Gtk.TreeView):
def __init__(self, model=None):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
if model != None:
self.set_model(model)
diff --git a/client/gnomedvb/ui/widgets/ChannelsStore.py b/client/gnomedvb/ui/widgets/ChannelsStore.py
index 99ea678..c106813 100644
--- a/client/gnomedvb/ui/widgets/ChannelsStore.py
+++ b/client/gnomedvb/ui/widgets/ChannelsStore.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
from gi.repository import Gtk
-import gobject
+from gi.repository import GObject
import gnomedvb
from gnomedvb import global_error_handler
from gnomedvb.Callback import Callback
@@ -30,7 +30,7 @@ class ChannelsStore(Gtk.ListStore):
COL_SID,) = range(2)
__gsignals__ = {
- "loading-finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
+ "loading-finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
}
def __init__(self, device_group):
@@ -66,11 +66,11 @@ class ChannelsTreeStore(Gtk.TreeStore):
COL_GROUP,) = range(4)
__gsignals__ = {
- "loading-finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int]),
+ "loading-finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int]),
}
def __init__(self, use_channel_groups=False):
- Gtk.TreeStore.__init__(self, int, str, long, gobject.GObject)
+ Gtk.TreeStore.__init__(self, int, str, long, GObject.GObject)
self.set_sort_order(Gtk.SortType.ASCENDING)
diff --git a/client/gnomedvb/ui/widgets/ChannelsView.py b/client/gnomedvb/ui/widgets/ChannelsView.py
index 3724864..fb4b0f1 100644
--- a/client/gnomedvb/ui/widgets/ChannelsView.py
+++ b/client/gnomedvb/ui/widgets/ChannelsView.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gettext import gettext as _
@@ -28,7 +28,7 @@ class ChannelsView(Gtk.TreeView):
"""
@type model: ChannelsStore
"""
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
if model != None:
self.set_model(model)
diff --git a/client/gnomedvb/ui/widgets/DateTime.py b/client/gnomedvb/ui/widgets/DateTime.py
index 1eecb9e..e1291bb 100644
--- a/client/gnomedvb/ui/widgets/DateTime.py
+++ b/client/gnomedvb/ui/widgets/DateTime.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
from gettext import gettext as _
-import gobject
+from gi.repository import GObject
from gi.repository import Gdk
from gi.repository import Gtk
import datetime
@@ -25,12 +25,12 @@ import datetime
class CalendarPopup(Gtk.Window):
__gsignals__ = {
- "closed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
- "changed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, int, int, int, int]),
+ "closed": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
+ "changed": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int, int, int, int, int]),
}
def __init__(self, dt=None):
- gobject.GObject.__init__(self, type=Gtk.WindowType.POPUP)
+ GObject.GObject.__init__(self, type=Gtk.WindowType.POPUP)
self.set_border_width(5)
self.vbox = Gtk.VBox(spacing=12)
self.add(self.vbox)
@@ -153,11 +153,11 @@ class CalendarPopup(Gtk.Window):
class DateTimeBox(Gtk.Bin):
__gsignals__ = {
- "changed": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [int, int, int, int, int]),
+ "changed": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [int, int, int, int, int]),
}
def __init__(self, dt=None):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.valid_color = None
self.invalid_color = None
diff --git a/client/gnomedvb/ui/widgets/Frame.py b/client/gnomedvb/ui/widgets/Frame.py
index 22370f2..ee2cd60 100644
--- a/client/gnomedvb/ui/widgets/Frame.py
+++ b/client/gnomedvb/ui/widgets/Frame.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
__all__ = ["Frame", "BaseFrame", "TextFieldLabel"]
@@ -24,7 +24,7 @@ __all__ = ["Frame", "BaseFrame", "TextFieldLabel"]
class BaseFrame(Gtk.VBox):
def __init__(self, markup, child, expand=True, fill=True, padding=0):
- gobject.GObject.__init__(self, spacing=6)
+ GObject.GObject.__init__(self, spacing=6)
label = Gtk.Label()
label.set_halign(Gtk.Align.START)
@@ -47,7 +47,7 @@ class BaseFrame(Gtk.VBox):
class TextFieldLabel(Gtk.Label):
def __init__(self, markup=None, **kwargs):
- gobject.GObject.__init__(self, **kwargs)
+ GObject.GObject.__init__(self, **kwargs)
if markup:
self.set_markup(markup)
diff --git a/client/gnomedvb/ui/widgets/HelpBox.py b/client/gnomedvb/ui/widgets/HelpBox.py
index fa86986..73b3aa2 100644
--- a/client/gnomedvb/ui/widgets/HelpBox.py
+++ b/client/gnomedvb/ui/widgets/HelpBox.py
@@ -16,14 +16,14 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gi.repository import Pango
class HelpBox(Gtk.EventBox):
def __init__(self):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
frame = Gtk.Frame()
frame.set_shadow_type(Gtk.ShadowType.IN)
diff --git a/client/gnomedvb/ui/widgets/RecordingsStore.py b/client/gnomedvb/ui/widgets/RecordingsStore.py
index 225f170..36d9d17 100644
--- a/client/gnomedvb/ui/widgets/RecordingsStore.py
+++ b/client/gnomedvb/ui/widgets/RecordingsStore.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
import datetime
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gnomedvb import DVBRecordingsStoreClient, global_error_handler
from cgi import escape
@@ -32,7 +32,7 @@ class RecordingsStore(Gtk.ListStore):
COL_ID,) = range(6)
def __init__(self):
- Gtk.ListStore.__init__(self, gobject.TYPE_PYOBJECT, str, str, long, str, long)
+ Gtk.ListStore.__init__(self, GObject.TYPE_PYOBJECT, str, str, long, str, long)
self._recstore = DVBRecordingsStoreClient()
self._recstore.connect("changed", self._on_changed)
diff --git a/client/gnomedvb/ui/widgets/RecordingsView.py b/client/gnomedvb/ui/widgets/RecordingsView.py
index 3063a4e..5bbe463 100644
--- a/client/gnomedvb/ui/widgets/RecordingsView.py
+++ b/client/gnomedvb/ui/widgets/RecordingsView.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gettext import gettext as _
@@ -27,7 +27,7 @@ from gnomedvb.ui.widgets.CellRendererDatetime import CellRendererDatetime
class RecordingsView(Gtk.TreeView):
def __init__(self, model=None):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
if model != None:
self.set_model(model)
diff --git a/client/gnomedvb/ui/widgets/RunningNextView.py b/client/gnomedvb/ui/widgets/RunningNextView.py
index bb32f4f..e0f33cd 100644
--- a/client/gnomedvb/ui/widgets/RunningNextView.py
+++ b/client/gnomedvb/ui/widgets/RunningNextView.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
import datetime
-import gobject
+from gi.repository import GObject
from gi.repository import Gdk
from gi.repository import Gtk
from gettext import gettext as _
@@ -29,7 +29,7 @@ from gnomedvb.ui.timers.MessageDialogs import TimerFailureDialog, TimerSuccessDi
class RunningNextView(Gtk.TreeView):
def __init__(self, model):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.set_model(model)
cell_channel = Gtk.CellRendererText()
@@ -103,7 +103,7 @@ class RunningNextView(Gtk.TreeView):
(devgroup.get_recorder(), event_id, sid,))
dialog.show()
dialog.connect("response", lambda d, resp: d.destroy())
-
+
if event.type == getattr(Gdk.EventType, "2BUTTON_PRESS"):
model, aiter = treeview.get_selection().get_selected()
if aiter != None:
diff --git a/client/gnomedvb/ui/widgets/SchedulePaned.py b/client/gnomedvb/ui/widgets/SchedulePaned.py
index 3f3f69f..5ee7c1e 100644
--- a/client/gnomedvb/ui/widgets/SchedulePaned.py
+++ b/client/gnomedvb/ui/widgets/SchedulePaned.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gnomedvb.ui.widgets.ScheduleStore import ScheduleStore
from gnomedvb.ui.widgets.ScheduleView import ScheduleView
@@ -24,7 +24,7 @@ from gnomedvb.ui.widgets.ScheduleView import ScheduleView
class SchedulePaned (Gtk.VPaned):
def __init__(self):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.scheduleview = ScheduleView()
self.scheduleview.show()
diff --git a/client/gnomedvb/ui/widgets/ScheduleStore.py b/client/gnomedvb/ui/widgets/ScheduleStore.py
index a30d2da..342dead 100644
--- a/client/gnomedvb/ui/widgets/ScheduleStore.py
+++ b/client/gnomedvb/ui/widgets/ScheduleStore.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
from gi.repository import Gtk
-import gobject
+from gi.repository import GObject
import datetime
from cgi import escape
from gnomedvb import global_error_handler
@@ -36,11 +36,11 @@ class ScheduleStore(Gtk.ListStore):
NEW_DAY = -1L
__gsignals__ = {
- "loading-finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
+ "loading-finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
}
def __init__(self, dev_group, sid):
- Gtk.ListStore.__init__(self, gobject.TYPE_PYOBJECT, str, long, str, str, str, int, long)
+ Gtk.ListStore.__init__(self, GObject.TYPE_PYOBJECT, str, long, str, str, str, int, long)
self._client = dev_group.get_schedule(sid)
if self._client != None:
self._recorder = dev_group.get_recorder()
diff --git a/client/gnomedvb/ui/widgets/ScheduleView.py b/client/gnomedvb/ui/widgets/ScheduleView.py
index e31bb5c..5ce7f5b 100644
--- a/client/gnomedvb/ui/widgets/ScheduleView.py
+++ b/client/gnomedvb/ui/widgets/ScheduleView.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gi.repository import Pango
from gettext import gettext as _
@@ -27,7 +27,7 @@ from gnomedvb.ui.widgets.CellRendererDatetime import CellRendererDatetime
class ScheduleView(Gtk.TreeView):
def __init__(self, model=None):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
if model != None:
self.set_model(model)
diff --git a/client/gnomedvb/ui/wizard/SetupWizard.py b/client/gnomedvb/ui/wizard/SetupWizard.py
index c0f8302..73ab83b 100644
--- a/client/gnomedvb/ui/wizard/SetupWizard.py
+++ b/client/gnomedvb/ui/wizard/SetupWizard.py
@@ -17,7 +17,7 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
import gnomedvb
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
from gettext import gettext as _
from gnomedvb.DVBModel import DVBModel
@@ -47,7 +47,7 @@ class CloseDialog(Gtk.Dialog):
self.progressbar = Gtk.ProgressBar()
self.progressbar.set_pulse_step(0.1)
- self._progressbar_timer = gobject.timeout_add(100, self._progressbar_pulse)
+ self._progressbar_timer = GObject.timeout_add(100, self._progressbar_pulse)
self.progressbar.show()
vbox.pack_start(self.progressbar, False, True, 0)
@@ -66,7 +66,7 @@ class SetupWizard(Gtk.Assistant):
SUMMARY_PAGE) = range(7)
def __init__(self):
- gobject.GObject.__init__(self)
+ GObject.GObject.__init__(self)
self.__ask_on_exit = False
self.__adapter_info = None
self.__model = DVBModel()
diff --git a/client/gnomedvb/ui/wizard/pages/AdaptersPage.py b/client/gnomedvb/ui/wizard/pages/AdaptersPage.py
index adae44c..6e35632 100644
--- a/client/gnomedvb/ui/wizard/pages/AdaptersPage.py
+++ b/client/gnomedvb/ui/wizard/pages/AdaptersPage.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
import gnomedvb
from gi.repository import Gtk
from gettext import gettext as _
@@ -27,8 +27,8 @@ from gnomedvb.ui.widgets.Frame import BaseFrame
class AdaptersPage(BasePage):
__gsignals__ = {
- "finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [bool]),
- "next-page": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, []),
+ "finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [bool]),
+ "next-page": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, []),
}
def __init__(self, model):
@@ -122,10 +122,10 @@ class AdaptersPage(BasePage):
self._progressbar.set_fraction(0.1)
self._progressbar.show()
self.pack_start(self._progressbar, False, True, 0)
- self._progressbar_timer = gobject.timeout_add(100, self.progressbar_pulse, None)
+ self._progressbar_timer = GObject.timeout_add(100, self.progressbar_pulse, None)
def destroy_progressbar(self):
- gobject.source_remove(self._progressbar_timer)
+ GObject.source_remove(self._progressbar_timer)
self._progressbar_timer = None
self._progressbar.destroy()
diff --git a/client/gnomedvb/ui/wizard/pages/BasePage.py b/client/gnomedvb/ui/wizard/pages/BasePage.py
index 96ff5a6..24a2d22 100644
--- a/client/gnomedvb/ui/wizard/pages/BasePage.py
+++ b/client/gnomedvb/ui/wizard/pages/BasePage.py
@@ -16,13 +16,13 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
from gi.repository import Gtk
class BasePage(Gtk.VBox):
def __init__(self):
- gobject.GObject.__init__(self, spacing=6)
+ GObject.GObject.__init__(self, spacing=6)
self.set_border_width(24)
self._label = Gtk.Label()
diff --git a/client/gnomedvb/ui/wizard/pages/ChannelScanPage.py b/client/gnomedvb/ui/wizard/pages/ChannelScanPage.py
index 259740b..0006f3e 100644
--- a/client/gnomedvb/ui/wizard/pages/ChannelScanPage.py
+++ b/client/gnomedvb/ui/wizard/pages/ChannelScanPage.py
@@ -18,7 +18,7 @@
from gi.repository import GdkPixbuf
from gi.repository import Gtk
-import gobject
+from gi.repository import GObject
from gettext import gettext as _
from gnomedvb.ui.wizard.pages.BasePage import BasePage
from gnomedvb.ui.widgets.Frame import TextFieldLabel
@@ -27,7 +27,7 @@ from gnomedvb import global_error_handler
class ChannelScanPage(BasePage):
__gsignals__ = {
- "finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [bool]),
+ "finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [bool]),
}
(COL_LOGO,
@@ -178,7 +178,7 @@ class ChannelScanPage(BasePage):
self._scanner.connect ("frontend-stats", self.__on_frontend_stats)
self.progressbar.set_pulse_step(0.1)
- self._progressbar_timer = gobject.timeout_add(100, self._progressbar_pulse)
+ self._progressbar_timer = GObject.timeout_add(100, self._progressbar_pulse)
self.progressbar.show()
if isinstance(tuning_data, str):
@@ -207,7 +207,7 @@ class ChannelScanPage(BasePage):
elif channeltype == "Radio":
icon = self._theme.load_icon("audio-x-generic", 16,
Gtk.IconLookupFlags.USE_BUILTIN)
- except gobject.GError:
+ except GObject.GError:
icon = None
name = name.replace("&", "&")
@@ -230,7 +230,7 @@ class ChannelScanPage(BasePage):
fraction = float(self._scanned_freqs) / self._max_freqs
# Stop progressbar from pulsing
if self._progressbar_timer > 0:
- gobject.source_remove(self._progressbar_timer)
+ GObject.source_remove(self._progressbar_timer)
self._progressbar_timer = 0
self.progressbar.set_fraction(fraction)
diff --git a/client/gnomedvb/ui/wizard/pages/InitialTuningDataPage.py b/client/gnomedvb/ui/wizard/pages/InitialTuningDataPage.py
index a8ff130..7e04420 100644
--- a/client/gnomedvb/ui/wizard/pages/InitialTuningDataPage.py
+++ b/client/gnomedvb/ui/wizard/pages/InitialTuningDataPage.py
@@ -21,7 +21,7 @@ import os.path
from gi.repository import Gdk
from gi.repository import Gtk
from gi.repository import GLib
-import gobject
+from gi.repository import GObject
import gettext
import locale
from gettext import gettext as _
@@ -62,7 +62,7 @@ COUNTRIES = {
class InitialTuningDataPage(BasePage):
__gsignals__ = {
- "finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [bool]),
+ "finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [bool]),
}
NOT_LISTED = "00"
@@ -295,7 +295,7 @@ class InitialTuningDataPage(BasePage):
toplevel_window.set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
# Fill list async
- gobject.idle_add(self._fill_providers, selected_country)
+ GObject.idle_add(self._fill_providers, selected_country)
def _fill_providers(self, selected_country):
# Only DVB-T has bruteforce scan
diff --git a/client/gnomedvb/ui/wizard/pages/SaveChannelListPage.py b/client/gnomedvb/ui/wizard/pages/SaveChannelListPage.py
index 0260455..b94d3c9 100644
--- a/client/gnomedvb/ui/wizard/pages/SaveChannelListPage.py
+++ b/client/gnomedvb/ui/wizard/pages/SaveChannelListPage.py
@@ -17,14 +17,14 @@
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
from gi.repository import Gtk
-import gobject
+from gi.repository import GObject
from gettext import gettext as _
from gnomedvb.ui.wizard.pages.BasePage import BasePage
class SaveChannelListPage(BasePage):
__gsignals__ = {
- "finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [bool]),
+ "finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [bool]),
}
def __init__(self):
diff --git a/client/gnomedvb/ui/wizard/pages/SetupDevicePage.py b/client/gnomedvb/ui/wizard/pages/SetupDevicePage.py
index 5cf9c3a..4fd7a51 100644
--- a/client/gnomedvb/ui/wizard/pages/SetupDevicePage.py
+++ b/client/gnomedvb/ui/wizard/pages/SetupDevicePage.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with GNOME DVB Daemon. If not, see <http://www.gnu.org/licenses/>.
-import gobject
+from gi.repository import GObject
import gnomedvb
from gi.repository import Gtk
import os.path
@@ -27,7 +27,7 @@ from gnomedvb.ui.wizard.pages.BasePage import BasePage
class SetupDevicePage(BasePage):
__gsignals__ = {
- "finished": (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [bool]),
+ "finished": (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, [bool]),
}
def __init__(self, model):
@@ -90,10 +90,10 @@ class SetupDevicePage(BasePage):
self._progressbar.set_fraction(0.1)
self._progressbar.show()
self.pack_start(self._progressbar, False, True, 0)
- self._progressbar_timer = gobject.timeout_add(100, self.progressbar_pulse)
+ self._progressbar_timer = GObject.timeout_add(100, self.progressbar_pulse)
def destroy_progressbar(self):
- gobject.source_remove(self._progressbar_timer)
+ GObject.source_remove(self._progressbar_timer)
self._progressbar_timer = None
self._progressbar.destroy()
diff --git a/client/totem-plugin/dvb-daemon.py b/client/totem-plugin/dvb-daemon.py
index 337ed26..fb0d9c2 100644
--- a/client/totem-plugin/dvb-daemon.py
+++ b/client/totem-plugin/dvb-daemon.py
@@ -18,7 +18,7 @@
import gettext
import gnomedvb
-import gobject
+from gi.repository import GObject
import os
import os.path
import sys
@@ -221,11 +221,11 @@ class RunningNextDialog(Gtk.Dialog):
self.scrolledschedule.show()
-class DVBDaemonPlugin(gobject.GObject, Peas.Activatable):
+class DVBDaemonPlugin(GObject.GObject, Peas.Activatable):
__gtype_name__ = 'DVBDaemonPlugin'
- object = gobject.property(type = gobject.GObject)
+ object = GObject.property(type = GObject.GObject)
REC_GROUP_ID = -1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
