[pitivi] Fix pylint unused-argument
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Fix pylint unused-argument
- Date: Mon, 11 Nov 2019 22:05:44 +0000 (UTC)
commit e9483250f3340074df9cffd706557179b7fa985d
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Mon Oct 28 21:06:06 2019 +0100
Fix pylint unused-argument
data/ui/effectslibrary.ui | 6 ++--
data/ui/medialibrary.ui | 4 +--
pitivi/editorperspective.py | 4 +--
pitivi/effects.py | 6 ++--
pitivi/medialibrary.py | 65 ++++++++++++++++++-----------------
pitivi/project.py | 33 +++++++++---------
pitivi/render.py | 6 ++--
pitivi/timeline/elements.py | 28 ++++++++--------
pitivi/timeline/layer.py | 12 +++----
pitivi/timeline/timeline.py | 6 ++--
pitivi/transitions.py | 12 +++----
pitivi/undo/undo.py | 1 +
pitivi/utils/proxy.py | 18 +++++-----
pitivi/utils/ripple_update_group.py | 4 +--
pitivi/utils/validate.py | 67 ++++++++++++++++++-------------------
pitivi/utils/widgets.py | 28 ++++++++--------
pitivi/viewer/overlay_stack.py | 4 +--
17 files changed, 150 insertions(+), 154 deletions(-)
---
diff --git a/data/ui/effectslibrary.ui b/data/ui/effectslibrary.ui
index 21d80397..be646e7d 100644
--- a/data/ui/effectslibrary.ui
+++ b/data/ui/effectslibrary.ui
@@ -54,7 +54,7 @@
<object class="GtkComboBoxText" id="categories">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <signal name="changed" handler="_categoryChangedCb" swapped="no"/>
+ <signal name="changed" handler="_category_changed_cb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="categories-atkobject">
<property name="AtkObject::accessible-name">effect category combobox</property>
@@ -83,8 +83,8 @@
<property name="secondary_icon_name">edit-clear-symbolic</property>
<property name="secondary_icon_tooltip_text" translatable="yes">Clear the current
search</property>
<property name="placeholder_text" translatable="yes">Search...</property>
- <signal name="changed" handler="_searchEntryChangedCb" swapped="no"/>
- <signal name="icon-release" handler="_searchEntryIconClickedCb" swapped="no"/>
+ <signal name="changed" handler="_search_entry_changed_cb" swapped="no"/>
+ <signal name="icon-release" handler="_search_entry_icon_press_cb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="search_entry-atkobject">
<property name="AtkObject::accessible-name">effects library search entry</property>
diff --git a/data/ui/medialibrary.ui b/data/ui/medialibrary.ui
index 51207c18..b1981c4c 100644
--- a/data/ui/medialibrary.ui
+++ b/data/ui/medialibrary.ui
@@ -122,8 +122,8 @@
<property name="primary_icon_tooltip_text" translatable="yes" comments="This is used as a
toolbar button tooltip. Here, "select" means "find" rather than "choose". It is
not the user who selects, but rather the user requesting the application to select the relevant
items.">Select clips that have not been used in the project</property>
<property name="secondary_icon_tooltip_text" translatable="yes">Show all clips</property>
<property name="placeholder_text" translatable="yes">Search...</property>
- <signal name="changed" handler="_searchEntryChangedCb" swapped="no"/>
- <signal name="icon-release" handler="_searchEntryIconClickedCb" swapped="no"/>
+ <signal name="changed" handler="_search_entry_changed_cb" swapped="no"/>
+ <signal name="icon-release" handler="_search_entry_icon_press_cb" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="media_search_entry-atkobject">
<property name="AtkObject::accessible-name">media_search_entry</property>
diff --git a/pitivi/editorperspective.py b/pitivi/editorperspective.py
index 74d85f5f..48c5b5fe 100644
--- a/pitivi/editorperspective.py
+++ b/pitivi/editorperspective.py
@@ -821,7 +821,7 @@ class PreviewAssetWindow(Gtk.Window):
self._previewer.preview_uri(self._asset.get_id())
self._previewer.show()
- self.connect("focus-out-event", self._leavePreviewCb)
+ self.connect("focus-out-event", self._leave_preview_cb)
def preview(self):
"""Shows the window and starts the playback."""
@@ -863,6 +863,6 @@ class PreviewAssetWindow(Gtk.Window):
new_height = max_width * img_height / img_width
return int(max_width), int(new_height + controls_height)
- def _leavePreviewCb(self, window, unused):
+ def _leave_preview_cb(self, window, unused):
self.destroy()
return True
diff --git a/pitivi/effects.py b/pitivi/effects.py
index 931b06fc..613985d1 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -577,13 +577,13 @@ class EffectListWidget(Gtk.Box, Loggable):
self.populate_categories_widget()
self.model_filter.refilter()
- def _categoryChangedCb(self, unused_combobox):
+ def _category_changed_cb(self, combobox):
self.model_filter.refilter()
- def _searchEntryChangedCb(self, unused_entry):
+ def _search_entry_changed_cb(self, unused_entry):
self.model_filter.refilter()
- def _searchEntryIconClickedCb(self, entry, unused, unused1):
+ def _search_entry_icon_press_cb(self, entry, icon_pos, event):
entry.set_text("")
def _setRowVisible(self, model, iter, unused_data):
diff --git a/pitivi/medialibrary.py b/pitivi/medialibrary.py
index 92a139fc..a85797b3 100644
--- a/pitivi/medialibrary.py
+++ b/pitivi/medialibrary.py
@@ -571,12 +571,12 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
"button-press-event", self._treeViewButtonPressEventCb)
self.treeview.connect(
"button-release-event", self._treeViewButtonReleaseEventCb)
- self.treeview.connect("row-activated", self._itemOrRowActivatedCb)
+ self.treeview.connect("row-activated", self._iconview_item_or_row_activated_cb)
self.treeview.set_headers_visible(False)
self.treeview.set_property("search_column", COL_SEARCH_TEXT)
tsel = self.treeview.get_selection()
tsel.set_mode(Gtk.SelectionMode.MULTIPLE)
- tsel.connect("changed", self._viewSelectionChangedCb)
+ tsel.connect("changed", self._iconview_selection_changed_cb)
pixbufcol = Gtk.TreeViewColumn(_("Icon"))
pixbufcol.set_expand(False)
@@ -605,12 +605,11 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
self.iconview = Gtk.IconView(model=self.modelFilter)
self.iconview_scrollwin.add(self.iconview)
self.iconview.connect(
- "button-press-event", self._iconViewButtonPressEventCb)
+ "button-press-event", self._iconview_button_press_event_cb)
self.iconview.connect(
- "button-release-event", self._iconViewButtonReleaseEventCb)
- self.iconview.connect("item-activated", self._itemOrRowActivatedCb)
- self.iconview.connect(
- "selection-changed", self._viewSelectionChangedCb)
+ "button-release-event", self._iconview_button_release_event_cb)
+ self.iconview.connect("item-activated", self._iconview_item_or_row_activated_cb)
+ self.iconview.connect("selection-changed", self._iconview_selection_changed_cb)
self.iconview.set_item_orientation(Gtk.Orientation.VERTICAL)
self.iconview.set_property("has_tooltip", True)
self.iconview.set_tooltip_column(COL_INFOTEXT)
@@ -643,9 +642,9 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
project_manager = self.app.project_manager
project_manager.connect(
"new-project-loading", self._new_project_loading_cb)
- project_manager.connect("new-project-loaded", self._newProjectLoadedCb)
- project_manager.connect("new-project-failed", self._newProjectFailedCb)
- project_manager.connect("project-closed", self._projectClosedCb)
+ project_manager.connect("new-project-loaded", self._new_project_loaded_cb)
+ project_manager.connect("new-project-failed", self._new_project_failed_cb)
+ project_manager.connect("project-closed", self._project_closed_cb)
# Drag and Drop
self.drag_dest_set(Gtk.DestDefaults.DROP | Gtk.DestDefaults.MOTION,
@@ -696,9 +695,9 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
self.debug("Finalizing %s", self)
self.app.project_manager.disconnect_by_func(self._new_project_loading_cb)
- self.app.project_manager.disconnect_by_func(self._newProjectLoadedCb)
- self.app.project_manager.disconnect_by_func(self._newProjectFailedCb)
- self.app.project_manager.disconnect_by_func(self._projectClosedCb)
+ self.app.project_manager.disconnect_by_func(self._new_project_loaded_cb)
+ self.app.project_manager.disconnect_by_func(self._new_project_failed_cb)
+ self.app.project_manager.disconnect_by_func(self._project_closed_cb)
if not self._project:
self.debug("No project set...")
@@ -745,9 +744,9 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
view.enable_model_drag_source(
Gdk.ModifierType.BUTTON1_MASK, [URI_TARGET_ENTRY], Gdk.DragAction.COPY)
view.drag_source_add_uri_targets()
- view.connect("drag-data-get", self._dndDragDataGetCb)
- view.connect_after("drag-begin", self._dndDragBeginCb)
- view.connect("drag-end", self._dndDragEndCb)
+ view.connect("drag-data-get", self._dnd_drag_data_get_cb)
+ view.connect_after("drag-begin", self._dnd_drag_begin_cb)
+ view.connect("drag-end", self._dnd_drag_end_cb)
def __updateViewCb(self, unused_model, unused_path, unused_iter=None):
if not len(self.storemodel):
@@ -787,7 +786,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
def _insertEndCb(self, unused_action, unused_parameter):
self.app.gui.editor.timeline_ui.insertAssets(self.getSelectedAssets(), -1)
- def _searchEntryChangedCb(self, entry):
+ def _search_entry_changed_cb(self, entry):
# With many hundred clips in an iconview with dynamic columns and
# ellipsizing, doing needless searches is very expensive.
# Realistically, nobody expects to search for only one character,
@@ -795,7 +794,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
if len(entry.get_text()) != 1:
self.modelFilter.refilter()
- def _searchEntryIconClickedCb(self, entry, icon_pos, unused_event):
+ def _search_entry_icon_press_cb(self, entry, icon_pos, event):
if icon_pos == Gtk.EntryIconPosition.SECONDARY:
entry.set_text("")
elif icon_pos == Gtk.EntryIconPosition.PRIMARY:
@@ -979,7 +978,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
row[COL_ICON_128] = asset_previewer.large_thumb
if progress == 0:
- self._startImporting(project)
+ self._startImporting()
return
if project.loaded:
@@ -1086,7 +1085,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
error = (id, str(error.domain), error)
self._errors.append(error)
- def _startImporting(self, project):
+ def _startImporting(self):
self.__last_proxying_estimate_time = _("Unknown")
self.import_start_time = time.time()
self._welcome_infobar.hide()
@@ -1553,7 +1552,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
if path:
selection.select_path(path[0])
- def _viewSelectionChangedCb(self, unused):
+ def _iconview_selection_changed_cb(self, unused):
self._updateActions()
def _updateActions(self):
@@ -1563,7 +1562,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
# Some actions can only be done on a single item at a time:
self._clipprops_button.set_sensitive(selected_count == 1)
- def _itemOrRowActivatedCb(self, unused_view, path, *unused_args):
+ def _iconview_item_or_row_activated_cb(self, unused_view, path, *unused_args):
"""Plays the asset identified by the specified path.
This can happen when an item is double-clicked, or
@@ -1573,7 +1572,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
asset = self.modelFilter[path][COL_ASSET]
self.emit('play', asset)
- def _iconViewButtonPressEventCb(self, iconview, event):
+ def _iconview_button_press_event_cb(self, iconview, event):
self._updateDraggedPaths(iconview, event)
Gtk.IconView.do_button_press_event(iconview, event)
@@ -1587,7 +1586,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
return True
- def _iconViewButtonReleaseEventCb(self, iconview, event):
+ def _iconview_button_release_event_cb(self, iconview, event):
self._draggedPaths = None
control_mask = event.get_state() & Gdk.ModifierType.CONTROL_MASK
@@ -1615,7 +1614,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
self._project.disconnect_by_func(self._errorCreatingAssetCb)
self._project.disconnect_by_func(self.__projectSettingsSetFromImportedAssetCb)
- def _new_project_loading_cb(self, unused_project_manager, project):
+ def _new_project_loading_cb(self, project_manager, project):
assert not self._project
self._project = project
@@ -1624,15 +1623,15 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
self._welcome_infobar.show_all()
self._connectToProject(project)
- def _newProjectLoadedCb(self, unused_project_manager, project):
+ def _new_project_loaded_cb(self, project_manager, project):
# Make sure that the sources added to the project are added
self._flushPendingAssets()
- def _newProjectFailedCb(self, unused_project_manager, unused_uri, unused_reason):
+ def _new_project_failed_cb(self, project_manager, uri, reason):
self.storemodel.clear()
self._project = None
- def _projectClosedCb(self, unused_project_manager, unused_project):
+ def _project_closed_cb(self, project_manager, project):
self.__disconnectFromProject()
self._project_settings_infobar.hide()
self.storemodel.clear()
@@ -1656,8 +1655,8 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
else:
self._project.addUris(uris)
- def _drag_data_received_cb(self, unused_widget, unused_context, unused_x,
- unused_y, selection, targettype, unused_time):
+ def _drag_data_received_cb(self, widget, context, x, y,
+ selection, targettype, time):
"""Handles data being dragged onto self."""
self.debug("targettype: %d, selection.data: %r",
targettype, selection.get_data())
@@ -1667,12 +1666,12 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
self.app.threads.addThread(PathWalker, uris, self.__paths_walked_cb)
# Used with TreeView and IconView
- def _dndDragDataGetCb(self, unused_view, unused_context, data, unused_info, unused_timestamp):
+ def _dnd_drag_data_get_cb(self, view, context, data, info, timestamp):
paths = self.getSelectedPaths()
uris = [self.modelFilter[path][COL_URI] for path in paths]
data.set_uris(uris)
- def _dndDragBeginCb(self, unused_view, context):
+ def _dnd_drag_begin_cb(self, view, context):
self.info("Drag operation begun")
self.dragged = True
paths = self.getSelectedPaths()
@@ -1697,7 +1696,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
Gtk.drag_set_icon_surface(context, surface)
- def _dndDragEndCb(self, unused_view, unused_context):
+ def _dnd_drag_end_cb(self, view, context):
self.info("Drag operation ended")
self.dragged = False
diff --git a/pitivi/project.py b/pitivi/project.py
index bbbca375..03754f6e 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -676,7 +676,7 @@ class Project(Loggable, GES.Project):
self.loading_assets = set()
self.relocated_assets = {}
- self.app.proxy_manager.connect("progress", self.__assetTranscodingProgressCb)
+ self.app.proxy_manager.connect("progress", self.__asset_transcoding_progress_cb)
self.app.proxy_manager.connect("error-preparing-asset",
self.__proxyErrorCb)
self.app.proxy_manager.connect("asset-preparing-cancelled",
@@ -749,7 +749,7 @@ class Project(Loggable, GES.Project):
# as they apply only for rendering.
self._has_rendering_values = False
- def _scenarioDoneCb(self, scenario):
+ def _scenario_done_cb(self, scenario):
if self.pipeline is not None:
self.pipeline.setForcePositionListener(False)
@@ -764,7 +764,7 @@ class Project(Loggable, GES.Project):
self._scenario = GstValidate.Scenario.factory_create(
self.runner, self.pipeline, self.scenario)
self.pipeline.setForcePositionListener(True)
- self._scenario.connect("done", self._scenarioDoneCb)
+ self._scenario.connect("done", self._scenario_done_cb)
self._scenario.props.execute_on_idle = True
# --------------- #
@@ -1132,8 +1132,8 @@ class Project(Loggable, GES.Project):
# ------------------------------#
# Proxy creation implementation #
# ------------------------------#
- def __assetTranscodingProgressCb(self, unused_proxy_manager, asset,
- creation_progress, estimated_time):
+ def __asset_transcoding_progress_cb(self, proxy_manager, asset,
+ creation_progress, estimated_time):
self.__updateAssetLoadingProgress(estimated_time)
def __get_loading_project_progress(self):
@@ -1419,15 +1419,14 @@ class Project(Loggable, GES.Project):
if profiles:
# The project just loaded, check the new
# encoding profile and make use of it now.
- self.set_container_profile(profiles[0], reset_all=True)
+ self.set_container_profile(profiles[0])
self._load_encoder_settings(profiles)
- def set_container_profile(self, container_profile, reset_all=False):
+ def set_container_profile(self, container_profile):
"""Sets @container_profile as new profile if usable.
Attributes:
profile (Gst.EncodingProfile): The Gst.EncodingContainerProfile to use
- reset_all (bool): Do not use restrictions from the previously set profile
"""
if container_profile == self.container_profile:
return False
@@ -1519,8 +1518,8 @@ class Project(Loggable, GES.Project):
Makes sure the project won't be doing anything after the call.
"""
if self._scenario:
- self._scenario.disconnect_by_func(self._scenarioDoneCb)
- self.app.proxy_manager.disconnect_by_func(self.__assetTranscodingProgressCb)
+ self._scenario.disconnect_by_func(self._scenario_done_cb)
+ self.app.proxy_manager.disconnect_by_func(self.__asset_transcoding_progress_cb)
self.app.proxy_manager.disconnect_by_func(self.__proxyErrorCb)
self.app.proxy_manager.disconnect_by_func(self.__assetTranscodingCancelledCb)
self.app.proxy_manager.disconnect_by_func(self.__proxyReadyCb)
@@ -2083,19 +2082,19 @@ class ProjectSettingsDialog:
self.wg = RippleUpdateGroup()
self.wg.addVertex(self.frame_rate_combo,
signal="changed",
- update_func=self._updateCombo,
+ update_func=self._update_combo_func,
update_func_args=(self.frame_rate_fraction_widget,))
self.wg.addVertex(self.frame_rate_fraction_widget,
signal="value-changed",
- update_func=self._updateFraction,
+ update_func=self._update_fraction_func,
update_func_args=(self.frame_rate_combo,))
self.wg.addVertex(self.width_spinbutton, signal="value-changed")
self.wg.addVertex(self.height_spinbutton, signal="value-changed")
self.wg.addVertex(self.audio_preset_menubutton,
- update_func=self._updatePresetMenuButton,
+ update_func=self._update_preset_menu_button_func,
update_func_args=(self.audio_presets,))
self.wg.addVertex(self.video_preset_menubutton,
- update_func=self._updatePresetMenuButton,
+ update_func=self._update_preset_menu_button_func,
update_func_args=(self.video_presets,))
self.wg.addVertex(self.channels_combo, signal="changed")
self.wg.addVertex(self.sample_rate_combo, signal="changed")
@@ -2167,10 +2166,10 @@ class ProjectSettingsDialog:
def proxy_res_linked(self):
return self.proxy_res_linked_check.props.active
- def _updateFraction(self, unused, fraction, combo):
+ def _update_fraction_func(self, unused, fraction, combo):
fraction.setWidgetValue(get_combo_value(combo))
- def _updateCombo(self, unused, combo, fraction):
+ def _update_combo_func(self, unused, combo, fraction):
set_combo_value(combo, fraction.getWidgetValue())
def __videoPresetLoadedCb(self, unused_mgr):
@@ -2184,7 +2183,7 @@ class ProjectSettingsDialog:
def _constrainSarButtonToggledCb(self, unused_button):
self.sar = self.getSAR()
- def _updatePresetMenuButton(self, unused_source, unused_target, mgr):
+ def _update_preset_menu_button_func(self, unused_source, unused_target, mgr):
mgr.updateMenuActions()
def updateWidth(self):
diff --git a/pitivi/render.py b/pitivi/render.py
index bac3510b..a9d89953 100644
--- a/pitivi/render.py
+++ b/pitivi/render.py
@@ -113,7 +113,7 @@ class Encoders(Loggable):
_instance = None
- def __new__(cls, *args, **kwargs):
+ def __new__(cls):
"""Returns the singleton instance."""
if not cls._instance:
cls._instance = super(Encoders, cls).__new__(cls)
@@ -892,7 +892,7 @@ class RenderDialog(Loggable):
self.dialog.ok_btn.connect(
"clicked", self._okButtonClickedCb, media_type)
- def __additional_debug_info(self, error):
+ def __additional_debug_info(self):
if self.project.vencoder == 'x264enc':
if self.project.videowidth % 2 or self.project.videoheight % 2:
return "\n\n%s\n\n" % _("<b>Make sure your rendering size is even, "
@@ -904,7 +904,7 @@ class RenderDialog(Loggable):
primary_message = _("Sorry, something didn’t work right.")
secondary_message = "".join([
_("An error occurred while trying to render your project."),
- self.__additional_debug_info(str(error)),
+ self.__additional_debug_info(),
_("You might want to check our troubleshooting guide or file a bug report. "
"The GStreamer error was:"),
"\n\n<i>" + str(error) + "</i>"])
diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
index c9e5b686..7dca7d71 100644
--- a/pitivi/timeline/elements.py
+++ b/pitivi/timeline/elements.py
@@ -1109,27 +1109,27 @@ class Clip(Gtk.EventBox, Zoomable, Loggable):
# Connect to Widget signals.
self.connect("button-release-event", self._button_release_event_cb)
- self.connect("event", self._eventCb)
+ self.connect("event", self._event_cb)
# Connect to GES signals.
- self.ges_clip.connect("notify::start", self._startChangedCb)
- self.ges_clip.connect("notify::inpoint", self._startChangedCb)
- self.ges_clip.connect("notify::duration", self._durationChangedCb)
- self.ges_clip.connect("notify::layer", self._layerChangedCb)
+ self.ges_clip.connect("notify::start", self._start_changed_cb)
+ self.ges_clip.connect("notify::inpoint", self._start_changed_cb)
+ self.ges_clip.connect("notify::duration", self._duration_changed_cb)
+ self.ges_clip.connect("notify::layer", self._layer_changed_cb)
self.ges_clip.connect_after("child-added", self._child_added_cb)
self.ges_clip.connect_after("child-removed", self._child_removed_cb)
# To be able to receive effects dragged on clips.
self.drag_dest_set(0, [EFFECT_TARGET_ENTRY], Gdk.DragAction.COPY)
- self.connect("drag-drop", self.__dragDropCb)
+ self.connect("drag-drop", self.__drag_drop_cb)
@property
def layer(self):
ges_layer = self.ges_clip.props.layer
return ges_layer.ui if ges_layer else None
- def __dragDropCb(self, unused_widget, context, x, y, timestamp):
+ def __drag_drop_cb(self, widget, context, x, y, timestamp):
success = False
target = self.drag_dest_find_target(context, None)
@@ -1290,9 +1290,9 @@ class Clip(Gtk.EventBox, Zoomable, Loggable):
for child in self.ges_clip.get_children(True):
self.__disconnectFromChild(child)
- disconnectAllByFunc(self.ges_clip, self._startChangedCb)
- disconnectAllByFunc(self.ges_clip, self._durationChangedCb)
- disconnectAllByFunc(self.ges_clip, self._layerChangedCb)
+ disconnectAllByFunc(self.ges_clip, self._start_changed_cb)
+ disconnectAllByFunc(self.ges_clip, self._duration_changed_cb)
+ disconnectAllByFunc(self.ges_clip, self._layer_changed_cb)
disconnectAllByFunc(self.ges_clip, self._child_added_cb)
disconnectAllByFunc(self.ges_clip, self._child_removed_cb)
@@ -1304,7 +1304,7 @@ class Clip(Gtk.EventBox, Zoomable, Loggable):
for handle in self.handles:
handle.hide()
- def _eventCb(self, element, event):
+ def _event_cb(self, element, event):
if (event.type == Gdk.EventType.ENTER_NOTIFY and
event.mode == Gdk.CrossingMode.NORMAL and
not self.timeline._scrubbing):
@@ -1319,13 +1319,13 @@ class Clip(Gtk.EventBox, Zoomable, Loggable):
return False
- def _startChangedCb(self, unused_clip, unused_pspec):
+ def _start_changed_cb(self, clip, pspec):
self.updatePosition()
- def _durationChangedCb(self, unused_clip, unused_pspec):
+ def _duration_changed_cb(self, clip, pspec):
self.updatePosition()
- def _layerChangedCb(self, ges_clip, unused_pspec):
+ def _layer_changed_cb(self, ges_clip, pspec):
self.updatePosition()
def __disconnectFromChild(self, child):
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index 2e8e4220..f8ebc4b0 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -320,10 +320,10 @@ class Layer(Gtk.Layout, Zoomable, Loggable):
if old_media_types != self.media_types:
self.updatePosition()
- def _childAddedToClipCb(self, ges_clip, child):
+ def _clip_child_added_cb(self, ges_clip, child):
self.checkMediaTypes()
- def _childRemovedFromClipCb(self, ges_clip, child):
+ def _clip_child_removed_cb(self, ges_clip, child):
self.checkMediaTypes()
def _clipAddedCb(self, unused_ges_layer, ges_clip):
@@ -344,8 +344,8 @@ class Layer(Gtk.Layout, Zoomable, Loggable):
self._changed = True
widget.show_all()
- ges_clip.connect_after("child-added", self._childAddedToClipCb)
- ges_clip.connect_after("child-removed", self._childRemovedFromClipCb)
+ ges_clip.connect_after("child-added", self._clip_child_added_cb)
+ ges_clip.connect_after("child-removed", self._clip_child_removed_cb)
def _clipRemovedCb(self, unused_ges_layer, ges_clip):
self._remove_clip(ges_clip)
@@ -366,8 +366,8 @@ class Layer(Gtk.Layout, Zoomable, Loggable):
ges_clip.ui.release()
ges_clip.ui = None
- ges_clip.disconnect_by_func(self._childAddedToClipCb)
- ges_clip.disconnect_by_func(self._childRemovedFromClipCb)
+ ges_clip.disconnect_by_func(self._clip_child_added_cb)
+ ges_clip.disconnect_by_func(self._clip_child_removed_cb)
def updatePosition(self):
for ges_clip in self.ges_layer.get_clips():
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 9c40fb36..a9c61851 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -452,7 +452,7 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
self.disconnect_by_func(self._button_release_event_cb)
self.disconnect_by_func(self._motion_notify_event_cb)
- self.ges_timeline.disconnect_by_func(self._durationChangedCb)
+ self.ges_timeline.disconnect_by_func(self._duration_changed_cb)
self.ges_timeline.disconnect_by_func(self._layer_added_cb)
self.ges_timeline.disconnect_by_func(self._layer_removed_cb)
self.ges_timeline.disconnect_by_func(self.__snapping_started_cb)
@@ -480,7 +480,7 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
self._add_layer(ges_layer)
self.__update_layers()
- self.ges_timeline.connect("notify::duration", self._durationChangedCb)
+ self.ges_timeline.connect("notify::duration", self._duration_changed_cb)
self.ges_timeline.connect("layer-added", self._layer_added_cb)
self.ges_timeline.connect("layer-removed", self._layer_removed_cb)
self.ges_timeline.connect("snapping-started", self.__snapping_started_cb)
@@ -492,7 +492,7 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
self.layout.update_width()
- def _durationChangedCb(self, ges_timeline, pspec):
+ def _duration_changed_cb(self, ges_timeline, pspec):
self.layout.update_width()
def scrollToPlayhead(self, align=None, when_not_in_view=False, delayed=False):
diff --git a/pitivi/transitions.py b/pitivi/transitions.py
index 558fd3e9..e5127c7a 100644
--- a/pitivi/transitions.py
+++ b/pitivi/transitions.py
@@ -124,9 +124,9 @@ class TransitionsListWidget(Gtk.Box, Loggable):
self.iconview_scrollwin.add(self.iconview)
self.iconview.set_property("has_tooltip", True)
- self.searchEntry.connect("changed", self._searchEntryChangedCb)
- self.searchEntry.connect("icon-press", self._searchEntryIconClickedCb)
- self.iconview.connect("query-tooltip", self._queryTooltipCb)
+ self.searchEntry.connect("changed", self._search_entry_changed_cb)
+ self.searchEntry.connect("icon-press", self._search_entry_icon_press_cb)
+ self.iconview.connect("query-tooltip", self._iconview_query_tooltip_cb)
# Speed-up startup by only checking available transitions on idle
GLib.idle_add(self._load_available_transitions_cb)
@@ -243,10 +243,10 @@ class TransitionsListWidget(Gtk.Box, Loggable):
self.border_scale.add_mark(
25000, Gtk.PositionType.BOTTOM, _("Smooth"))
- def _searchEntryChangedCb(self, unused_entry):
+ def _search_entry_changed_cb(self, entry):
self.modelFilter.refilter()
- def _searchEntryIconClickedCb(self, entry, unused, unused_1):
+ def _search_entry_icon_press_cb(self, entry, icon_pos, event):
entry.set_text("")
# UI methods
@@ -326,7 +326,7 @@ class TransitionsListWidget(Gtk.Box, Loggable):
icon = self._question_icon
return icon
- def _queryTooltipCb(self, view, x, y, keyboard_mode, tooltip):
+ def _iconview_query_tooltip_cb(self, view, x, y, keyboard_mode, tooltip):
is_row, x, y, model, path, iter_ = view.get_tooltip_context(
x, y, keyboard_mode)
if not is_row:
diff --git a/pitivi/undo/undo.py b/pitivi/undo/undo.py
index 72642f7e..5a5d1c91 100644
--- a/pitivi/undo/undo.py
+++ b/pitivi/undo/undo.py
@@ -58,6 +58,7 @@ class UndoableAction(Action):
def undo(self):
raise NotImplementedError()
+ # pylint: disable=unused-argument
def expand(self, action):
"""Allows the action to expand by including the specified action.
diff --git a/pitivi/utils/proxy.py b/pitivi/utils/proxy.py
index 55096401..826d676f 100644
--- a/pitivi/utils/proxy.py
+++ b/pitivi/utils/proxy.py
@@ -475,13 +475,13 @@ class ProxyManager(GObject.Object, Loggable):
self.emit("proxy-ready", asset, proxy)
self.__emitProgress(proxy, 100)
- def __transcoderErrorCb(self, transcoder, error, unused_details, asset):
+ def __transcoder_error_cb(self, transcoder, error, unused_details, asset):
self.emit("error-preparing-asset", asset, None, error)
- def __transcoderDoneCb(self, transcoder, asset):
- transcoder.disconnect_by_func(self.__proxyingPositionChangedCb)
- transcoder.disconnect_by_func(self.__transcoderDoneCb)
- transcoder.disconnect_by_func(self.__transcoderErrorCb)
+ def __transcoder_done_cb(self, transcoder, asset):
+ transcoder.disconnect_by_func(self.__proxying_position_changed_cb)
+ transcoder.disconnect_by_func(self.__transcoder_done_cb)
+ transcoder.disconnect_by_func(self.__transcoder_error_cb)
self.debug("Transcoder done with %s", asset.get_id())
@@ -538,7 +538,7 @@ class ProxyManager(GObject.Object, Loggable):
asset.creation_progress = creation_progress
self.emit("progress", asset, asset.creation_progress, estimated_time)
- def __proxyingPositionChangedCb(self, transcoder, position, asset):
+ def __proxying_position_changed_cb(self, transcoder, position, asset):
if transcoder not in self.__running_transcoders:
self.info("Position changed after job cancelled!")
return
@@ -642,11 +642,11 @@ class ProxyManager(GObject.Object, Loggable):
transcoder.set_cpu_usage(self.app.settings.max_cpu_usage)
transcoder.connect("position-updated",
- self.__proxyingPositionChangedCb,
+ self.__proxying_position_changed_cb,
asset)
- transcoder.connect("done", self.__transcoderDoneCb, asset)
- transcoder.connect("error", self.__transcoderErrorCb, asset)
+ transcoder.connect("done", self.__transcoder_done_cb, asset)
+ transcoder.connect("error", self.__transcoder_error_cb, asset)
if len(self.__running_transcoders) < self.app.settings.numTranscodingJobs:
self.__startTranscoder(transcoder)
diff --git a/pitivi/utils/ripple_update_group.py b/pitivi/utils/ripple_update_group.py
index 1f410823..63c903f4 100644
--- a/pitivi/utils/ripple_update_group.py
+++ b/pitivi/utils/ripple_update_group.py
@@ -88,7 +88,7 @@ class RippleUpdateGroup:
update_func.
"""
if signal:
- widget.connect(signal, self._widgetValueChanged)
+ widget.connect(signal, self._widget_value_changed_cb)
self.update_funcs[widget] = (update_func, update_func_args)
self.arcs[widget] = []
@@ -113,7 +113,7 @@ class RippleUpdateGroup:
self.addEdge(widget_a, widget_b, predicate, edge_func)
self.addEdge(widget_b, widget_a, predicate, edge_func)
- def _widgetValueChanged(self, widget, *unused):
+ def _widget_value_changed_cb(self, widget, *unused):
"""Handles an event generated by the specified widget."""
if self.ignore_new_signals:
return
diff --git a/pitivi/utils/validate.py b/pitivi/utils/validate.py
index c028f102..d8957eb8 100644
--- a/pitivi/utils/validate.py
+++ b/pitivi/utils/validate.py
@@ -73,14 +73,14 @@ if GstValidate:
import gi
gi.require_version('Wnck', '3.0')
from gi.repository import Wnck
- Wnck.Screen.get_default().connect("window-opened", self._windowOpenedCb)
+ Wnck.Screen.get_default().connect("window-opened", self._window_opened_cb)
except (ImportError, ValueError):
print("Wnck not present on the system,"
" not checking the sink does not open a new window")
except AttributeError:
print("Wnck can not be used on the system")
- def _windowOpenedCb(self, screen, window):
+ def _window_opened_cb(self, screen, window):
global monitor
if window.get_name() == 'renderer' and monitor:
@@ -111,7 +111,7 @@ def create_monitor(runner, app):
GstValidate.Reporter.set_name(monitor, "Pitivi")
-def stop(scenario, action):
+def stop_func(scenario, action):
global monitor
if monitor:
@@ -157,7 +157,7 @@ def positionChangedCb(pipeline, position, scenario, action,
action.set_done()
-def seek(scenario, action):
+def seek_func(scenario, action):
res, wanted_position = GstValidate.utils_get_clocktime(action.structure,
"start")
assert res
@@ -168,7 +168,7 @@ def seek(scenario, action):
return GstValidate.ActionReturn.ASYNC
-def set_state(scenario, action):
+def set_state_func(scenario, action):
wanted_state = action.structure["state"]
if wanted_state is None:
wanted_state = action.structure.get_name()
@@ -199,8 +199,8 @@ def get_edge(structure):
return edge
-def _releaseButtonIfNeeded(scenario, action, timeline, container, edge, layer_prio,
- position, y):
+def _release_button_if_needed(scenario, timeline, container, layer_prio,
+ position, y):
try:
next_actions = scenario.get_actions()
for next_action in next_actions[1:]:
@@ -275,7 +275,7 @@ def setEditingMode(timeline, scenario, action):
scenario.last_mode = mode
-def editContainer(scenario, action):
+def edit_container_func(scenario, action):
timeline = scenario.get_pipeline().props.timeline
container = timeline.get_element(action.structure["container-name"])
@@ -350,33 +350,29 @@ def editContainer(scenario, action):
get_event_widget.return_value = container.ui
timeline.ui._motion_notify_event_cb(None, event)
- GstValidate.print_action(action, "Editing %s to %s in %s mode, edge: %s "
+ GstValidate.print_action(action,
+ "Editing %s to %s in %s mode, edge: %s "
"with new layer prio: %d\n" % (action.structure["container-name"],
Gst.TIME_ARGS(position),
scenario.last_mode,
edge,
layer_prio))
- _releaseButtonIfNeeded(scenario, action, timeline, container, edge, layer_prio,
- position, y)
+ _release_button_if_needed(scenario, timeline, container, layer_prio,
+ position, y)
scenario.last_edge = edge
return 1
-# def commit(scenario, action):
-
-# return True
-
-
-def split_clip(scenario, action):
+def split_clip_func(scenario, action):
timeline = scenario.get_pipeline().props.timeline.ui
timeline.get_parent()._splitCb(None, None)
return True
-def zoom(scenario, action):
+def zoom_func(scenario, action):
timeline = scenario.get_pipeline().props.timeline
GstValidate.print_action(action, action.type.replace('-', ' ') + "\n")
@@ -388,13 +384,13 @@ def zoom(scenario, action):
return True
-def setZoomLevel(scenario, action):
+def set_zoom_level_func(scenario, action):
Zoomable.setZoomLevel(action.structure["level"])
return True
-def add_layer(scenario, action):
+def add_layer_func(scenario, action):
timeline = scenario.get_pipeline().props.timeline
if len(timeline.get_layers()) == 0:
GstValidate.print_action(action, "Adding first layer\n")
@@ -405,7 +401,7 @@ def add_layer(scenario, action):
return True
-def remove_clip(scenario, action):
+def remove_clip_func(scenario, action):
try:
next_action = scenario.get_actions()[1]
except KeyError:
@@ -424,7 +420,7 @@ def remove_clip(scenario, action):
return GstValidate.execute_action(action_type.overriden_type, action)
-def select_clips(scenario, action):
+def select_clips_func(scenario, action):
should_select = True
timeline = scenario.get_pipeline().props.timeline
clip = timeline.get_element(action.structure["clip-name"])
@@ -502,61 +498,62 @@ def init():
GstValidate.init()
has_validate = GES.validate_register_action_types()
GstValidate.register_action_type("stop", "pitivi",
- stop, None,
+ stop_func, None,
"Pitivi override for the stop action",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("seek", "pitivi",
- seek, None,
+ seek_func, None,
"Pitivi override for the seek action",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("pause", "pitivi",
- set_state, None,
+ set_state_func, None,
"Pitivi override for the pause action",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("play", "pitivi",
- set_state, None,
+ set_state_func, None,
"Pitivi override for the pause action",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("set-state", "pitivi",
- set_state, None,
+ set_state_func, None,
"Pitivi override for the set-state action",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("edit-container", "pitivi",
- editContainer, None,
+ edit_container_func, None,
"Start dragging a clip in the timeline",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("split-clip", "pitivi",
- split_clip, None,
+ split_clip_func, None,
"Split a clip",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("add-layer", "pitivi",
- add_layer, None,
+ add_layer_func, None,
"Add layer",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("remove-clip", "pitivi",
- remove_clip, None,
+ remove_clip_func, None,
"Remove clip",
GstValidate.ActionTypeFlags.NONE)
GstValidate.register_action_type("select-clips", "pitivi",
- select_clips,
+ select_clips_func,
[Parameter("clip-name",
"The name of the clip to select",
True, None, "str")],
"Select clips",
GstValidate.ActionTypeFlags.NONE)
- for z in ["zoom-fit", "zoom-out", "zoom-in"]:
- GstValidate.register_action_type(z, "pitivi", zoom, None, z,
+ for action_type in ["zoom-fit", "zoom-out", "zoom-in"]:
+ GstValidate.register_action_type(action_type, "pitivi",
+ zoom_func, None, action_type,
GstValidate.ActionTypeFlags.NO_EXECUTION_NOT_FATAL)
- GstValidate.register_action_type('set-zoom-level', "pitivi", setZoomLevel, None, z,
+ GstValidate.register_action_type('set-zoom-level', "pitivi", set_zoom_level_func, None, action_type,
GstValidate.ActionTypeFlags.NO_EXECUTION_NOT_FATAL)
Gst.info("Adding pitivi::wrong-window-creation")
diff --git a/pitivi/utils/widgets.py b/pitivi/utils/widgets.py
index 658f48e3..bac85969 100644
--- a/pitivi/utils/widgets.py
+++ b/pitivi/utils/widgets.py
@@ -72,7 +72,7 @@ class DynamicWidget(Loggable):
class DefaultWidget(Gtk.Label):
"""When all hope fails...."""
- def __init__(self, *unused, **unused_kwargs):
+ def __init__(self):
Gtk.Label.__init__(self, _("Implement Me"))
self.props.halign = Gtk.Align.START
@@ -760,7 +760,7 @@ class GstElementSettingsWidget(Gtk.Box, Loggable):
if dynamic_widget:
self.properties[prop] = dynamic_widget
- self.element.connect("notify::" + prop.name, self._propertyChangedCb,
+ self.element.connect("notify::" + prop.name, self._property_changed_cb,
dynamic_widget)
# The "reset to default" button associated with this property
if isinstance(to_default_btn, Gtk.Button):
@@ -935,7 +935,7 @@ class GstElementSettingsWidget(Gtk.Box, Loggable):
keyframe_button)
grid.attach(button, 3, y, 1, 1)
- self.element.connect('deep-notify', self._propertyChangedCb)
+ self.element.connect('deep-notify', self._property_changed_cb)
self.pack_start(grid, expand=False, fill=False, padding=0)
self.show_all()
@@ -953,7 +953,7 @@ class GstElementSettingsWidget(Gtk.Box, Loggable):
return widget
- def _propertyChangedCb(self, effect, gst_element, pspec):
+ def _property_changed_cb(self, effect, gst_element, pspec):
if gst_element.get_control_binding(pspec.name):
self.log("%s controlled, not displaying value", pspec.name)
return
@@ -1240,7 +1240,7 @@ class ZoomBox(Gtk.Grid, Zoomable):
zoom_fit_btn_grid.add(zoom_fit_btn_label)
zoom_fit_btn_grid.set_column_spacing(SPACING / 2)
zoom_fit_btn.add(zoom_fit_btn_grid)
- zoom_fit_btn.connect("clicked", self._zoomFitCb)
+ zoom_fit_btn.connect("clicked", self._zoom_fit_cb)
self.attach(zoom_fit_btn, 0, 0, 1, 1)
# zooming slider
@@ -1253,9 +1253,9 @@ class ZoomBox(Gtk.Grid, Zoomable):
# zoom slider, otherwise the slider remains at the leftmost position.
self._zoomAdjustment.set_value(Zoomable.getCurrentZoomLevel())
zoomslider.props.draw_value = False
- zoomslider.connect("scroll-event", self._zoomSliderScrollCb)
- zoomslider.connect("value-changed", self._zoomAdjustmentChangedCb)
- zoomslider.connect("query-tooltip", self._sliderTooltipCb)
+ zoomslider.connect("scroll-event", self._zoom_slider_scroll_cb)
+ zoomslider.connect("value-changed", self._zoom_slider_changed_cb)
+ zoomslider.connect("query-tooltip", self._zoom_slider_query_tooltip_cb)
zoomslider.set_has_tooltip(True)
# At least 100px wide for precision
zoomslider.set_size_request(100, 0)
@@ -1269,7 +1269,7 @@ class ZoomBox(Gtk.Grid, Zoomable):
self.set_column_spacing(ZOOM_SLIDER_PADDING)
self.show_all()
- def _zoomAdjustmentChangedCb(self, adjustment):
+ def _zoom_slider_changed_cb(self, adjustment):
Zoomable.setZoomLevel(adjustment.get_value())
self.timeline.app.write_action("set-zoom-level",
level=adjustment.get_value(),
@@ -1278,10 +1278,10 @@ class ZoomBox(Gtk.Grid, Zoomable):
if not self._manual_set:
self.timeline.timeline.scrollToPlayhead(delayed=True)
- def _zoomFitCb(self, unused_button):
+ def _zoom_fit_cb(self, button):
self.timeline.timeline.set_best_zoom_ratio(allow_zoom_in=True)
- def _zoomSliderScrollCb(self, unused, event):
+ def _zoom_slider_scroll_cb(self, unused, event):
delta = 0
if event.direction in [Gdk.ScrollDirection.UP, Gdk.ScrollDirection.RIGHT]:
delta = 1
@@ -1305,7 +1305,7 @@ class ZoomBox(Gtk.Grid, Zoomable):
finally:
self._manual_set = False
- def _sliderTooltipCb(self, unused_slider, unused_x, unused_y, unused_keyboard_mode, tooltip):
+ def _zoom_slider_query_tooltip_cb(self, unused_slider, unused_x, unused_y, unused_keyboard_mode,
tooltip):
# We assume the width of the ruler is exactly the width of the
# timeline.
width_px = self.timeline.ruler.get_allocated_width()
@@ -1439,11 +1439,11 @@ class ColorPickerButton(Gtk.Button):
def button_release_event_cb(self, widget, event):
if event.button != Gdk.BUTTON_PRIMARY:
return False
- self.grab_color_at_pointer(event.get_screen(), event.get_device(), event.x_root, event.y_root)
+ self.grab_color_at_pointer(event.get_screen(), event.x_root, event.y_root)
self.emit("value-changed")
self.shutdown_eyedropper()
- def grab_color_at_pointer(self, screen, device, x, y, *args):
+ def grab_color_at_pointer(self, screen, x, y):
root_window = screen.get_root_window()
pixbuf = Gdk.pixbuf_get_from_window(root_window, x, y, 1, 1)
pixels = pixbuf.get_pixels()
diff --git a/pitivi/viewer/overlay_stack.py b/pitivi/viewer/overlay_stack.py
index b578cc04..a1da95cf 100644
--- a/pitivi/viewer/overlay_stack.py
+++ b/pitivi/viewer/overlay_stack.py
@@ -50,7 +50,7 @@ class OverlayStack(Gtk.Overlay, Loggable):
Gdk.EventMask.LEAVE_NOTIFY_MASK |
Gdk.EventMask.ALL_EVENTS_MASK)
self.add(sink_widget)
- self.connect("size-allocate", self.__on_size_allocate)
+ self.connect("size-allocate", self.__size_allocate_cb)
# Whether to show the percent of the size relative to the project size.
# It is set to false initially because the viewer gets resized
@@ -65,7 +65,7 @@ class OverlayStack(Gtk.Overlay, Loggable):
self.add_overlay(self.revealer)
sink_widget.connect("size-allocate", self.__sink_widget_size_allocate_cb)
- def __on_size_allocate(self, widget, rectangle):
+ def __size_allocate_cb(self, widget, rectangle):
self.window_size = numpy.array([rectangle.width,
rectangle.height])
for overlay in self.__overlays.values():
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
