Skip to content

Commit

Permalink
fix: some signals names were not renamed
Browse files Browse the repository at this point in the history
Some signals were renamed moths ago, but not everywhere in the code.
  • Loading branch information
MightyCreak committed Apr 7, 2023
1 parent f35633b commit d42b0b9
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 19 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Replace `_` by `-` in the action names to be compatible with GTK action names (@MightyCreak)

### Fixed

- Some signals weren't properly renamed from the previous GTK3 migration (@MightyCreak)

## 0.8.1 - 2023-04-07

### Changed
Expand Down
32 changes: 16 additions & 16 deletions src/diffuse/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,8 @@ def setLineMode(self) -> None:
self.align_pane = 0
self.align_line = 0
self.mode = EditMode.LINE
self.emit('cursor_changed')
self.emit('mode_changed')
self.emit('cursor-changed')
self.emit('mode-changed')

# changes the viewer's mode to CHAR_MODE
def setCharMode(self) -> None:
Expand All @@ -541,8 +541,8 @@ def setCharMode(self) -> None:
self._im_focus_in()
self.im_context.reset()
self.mode = EditMode.CHAR
self.emit('cursor_changed')
self.emit('mode_changed')
self.emit('cursor-changed')
self.emit('mode-changed')

# sets the syntax highlighting rules
def setSyntax(self, s):
Expand All @@ -551,7 +551,7 @@ def setSyntax(self, s):
# invalidate the syntax caches
for pane in self.panes:
pane.syntax_cache = []
self.emit('syntax_changed', s)
self.emit('syntax-changed', s)
# force all panes to redraw
for darea in self.dareas:
darea.queue_draw()
Expand Down Expand Up @@ -733,7 +733,7 @@ def setFormat(self, f: int, fmt: LineEnding) -> None:
# create an Undo object for the action
self.addUndo(FileDiffViewerBase.SetFormatUndo(f, fmt, pane.format))
pane.format = fmt
self.emit('format_changed', f, fmt)
self.emit('format-changed', f, fmt)

# Undo for the creation of Line objects
class InstanceLineUndo:
Expand Down Expand Up @@ -806,7 +806,7 @@ def updateLineText(self, f, i, is_modified, text):
elif not is_modified and line.is_modified:
pane.num_edits -= 1
if pane.num_edits != old_num_edits:
self.emit('num_edits_changed', f)
self.emit('num-edits-changed', f)
line.is_modified = is_modified
line.modified_text = text
line.compare_string = None
Expand Down Expand Up @@ -1061,7 +1061,7 @@ def replaceLines(self, f, lines, new_lines, max_num, new_max_num):
if line is not None and line.is_modified:
pane.num_edits += 1
if pane.num_edits != old_num_edits:
self.emit('num_edits_changed', f)
self.emit('num-edits-changed', f)
del pane.syntax_cache[:]
pane.max_line_number = new_max_num
self.dareas[f].queue_draw()
Expand Down Expand Up @@ -1541,8 +1541,8 @@ def setEditMode(
self.setCurrentChar(self.current_line, self.current_char, True)
else:
self.setCurrentLine(self.current_pane, self.current_line, self.selection_line)
self.emit('cursor_changed')
self.emit('mode_changed')
self.emit('cursor-changed')
self.emit('mode-changed')
# queue a redraw to show the updated selection
self.dareas[old_f].queue_draw()

Expand Down Expand Up @@ -1585,7 +1585,7 @@ def setCurrentLine(self, f: int, i: int, selection: Optional[int] = None) -> Non
self.current_line = i
self.selection_line = selection if selection is not None else i

self.emit('cursor_changed')
self.emit('cursor-changed')

# invalidate old selection area
self._queue_draw_lines(old_f, line0, line1)
Expand Down Expand Up @@ -1697,7 +1697,7 @@ def setCurrentChar(self, i, j, si=None, sj=None):
self._set_clipboard_text(Gdk.SELECTION_PRIMARY, self.getSelectedText())

self._cursor_position_changed(True)
self.emit('cursor_changed')
self.emit('cursor-changed')

# invalidate old selection area
self._queue_draw_lines(f, line0, line1)
Expand Down Expand Up @@ -1809,7 +1809,7 @@ def darea_button_press_cb(self, widget, event, f):
self.mode = EditMode.CHAR
self._im_focus_in()
self.button_press(f, x, y, False)
self.emit('mode_changed')
self.emit('mode-changed')
elif self.mode == EditMode.CHAR and self.current_pane == f:
# select word
text = utils.strip_eol(self.getLineText(f, i))
Expand Down Expand Up @@ -2528,7 +2528,7 @@ def _line_mode_enter_align_mode(self):
self.selection_line = self.current_line
self.align_pane = self.current_pane
self.align_line = self.current_line
self.emit('mode_changed')
self.emit('mode-changed')
self.dareas[self.align_pane].queue_draw()

# 'first-line' keybinding action
Expand Down Expand Up @@ -3102,7 +3102,7 @@ def prefsUpdated(self) -> None:
for pane in self.panes:
del pane.diff_cache[:]
# tab width may have changed
self.emit('cursor_changed')
self.emit('cursor-changed')
for darea in self.dareas:
darea.queue_draw()
self.diffmap_cache = None
Expand Down Expand Up @@ -3298,7 +3298,7 @@ def swapPanes(self, f_dst: int, f_src: int) -> None:
# queue redraw
self.diffmap_cache = None
self.diffmap.queue_draw()
self.emit('swapped_panes', f_dst, f_src)
self.emit('swapped-panes', f_dst, f_src)

# swap the contents of two panes
def swap_panes(self, f_dst: int, f_src: int) -> None:
Expand Down
6 changes: 3 additions & 3 deletions src/diffuse/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def updateTitle(self) -> None:
s = ' '.join(ss)
self.label.set_text(s)
self.label.set_tooltip_text(s)
self.emit('title_changed')
self.emit('title-changed')

# set num edits
def setEdits(self, has_edits: bool) -> None:
Expand Down Expand Up @@ -373,7 +373,7 @@ def title_changed_cb(self, widget):
s = self.title
if has_edits:
s += ' *'
self.emit('title_changed', s)
self.emit('title-changed', s)

def setEncoding(self, f, encoding):
h = self.headers[f]
Expand Down Expand Up @@ -653,7 +653,7 @@ def updateStatus(self) -> None:
else:
s = None
self.status = s
self.emit('status_changed', s)
self.emit('status-changed', s)

# gets the status bar text
def getStatus(self) -> Optional[str]:
Expand Down

0 comments on commit d42b0b9

Please sign in to comment.