Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions spyder/plugins/application/confpage.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ def setup_page(self):
section='update_manager'
)
disable_zoom_mouse_cb = newcb(
_("Disable zoom with mouse wheel"),
'disable_zoom_mouse'
_("Disable zoom with Ctrl/Cmd + mouse wheel"), "disable_zoom_mouse"
)

# Decide if it's possible to activate or not single instance mode
Expand Down
4 changes: 2 additions & 2 deletions spyder/plugins/ipythonconsole/widgets/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -1558,13 +1558,13 @@ def focusOutEvent(self, event):
return super().focusOutEvent(event)

def eventFilter(self, obj, event):
etype = event.type()
if (
etype == QEvent.Wheel
event.type() == QEvent.Wheel
and self._control_key_down(event.modifiers())
and self.get_conf('disable_zoom_mouse', section='main')
):
return False

return super().eventFilter(obj, event)

# ---- Python methods
Expand Down
7 changes: 5 additions & 2 deletions spyder/plugins/profiler/widgets/main_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ def update_actions(self):
callers_or_callees_action.setChecked(False)
callers_or_callees_action.setEnabled(False)

if widget is not None:
if not widget_inactive:
if widget.is_profiling:
self.start_spinner()
else:
Expand All @@ -420,7 +420,8 @@ def update_actions(self):
# ProfilerWidgetActions.Home,
ProfilerWidgetActions.SlowLocal,
ProfilerWidgetActions.SaveData,
ProfilerWidgetActions.Search
ProfilerWidgetActions.LoadData,
ProfilerWidgetActions.Search,
]:
action = self.get_action(action_name)
if action_name in [
Expand All @@ -430,6 +431,8 @@ def update_actions(self):
action.setEnabled(
not tree_empty and not callers_or_callees_enabled
)
elif action_name == ProfilerWidgetActions.LoadData:
action.setEnabled(not widget_inactive)
else:
action.setEnabled(not tree_empty)

Expand Down
3 changes: 1 addition & 2 deletions spyder/utils/tests/test_vcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# Standard library imports
import os
import os.path as osp
import sys

# Test library imports
from spyder.utils import programs
Expand All @@ -31,7 +30,7 @@


@skipnogit
@pytest.mark.skipif(running_in_ci(), reason="Not to be run outside of CIs")
@pytest.mark.skipif(not running_in_ci(), reason="Not to be run outside of CIs")
def test_vcs_tool():
if not os.name == 'nt':
with pytest.raises(ActionToolNotFound):
Expand Down
Loading