Skip to content

Commit d42b0b9

Browse files
committed
fix: some signals names were not renamed
Some signals were renamed moths ago, but not everywhere in the code.
1 parent f35633b commit d42b0b9

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515

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

18+
### Fixed
19+
20+
- Some signals weren't properly renamed from the previous GTK3 migration (@MightyCreak)
21+
1822
## 0.8.1 - 2023-04-07
1923

2024
### Changed

src/diffuse/widgets.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,8 @@ def setLineMode(self) -> None:
523523
self.align_pane = 0
524524
self.align_line = 0
525525
self.mode = EditMode.LINE
526-
self.emit('cursor_changed')
527-
self.emit('mode_changed')
526+
self.emit('cursor-changed')
527+
self.emit('mode-changed')
528528

529529
# changes the viewer's mode to CHAR_MODE
530530
def setCharMode(self) -> None:
@@ -541,8 +541,8 @@ def setCharMode(self) -> None:
541541
self._im_focus_in()
542542
self.im_context.reset()
543543
self.mode = EditMode.CHAR
544-
self.emit('cursor_changed')
545-
self.emit('mode_changed')
544+
self.emit('cursor-changed')
545+
self.emit('mode-changed')
546546

547547
# sets the syntax highlighting rules
548548
def setSyntax(self, s):
@@ -551,7 +551,7 @@ def setSyntax(self, s):
551551
# invalidate the syntax caches
552552
for pane in self.panes:
553553
pane.syntax_cache = []
554-
self.emit('syntax_changed', s)
554+
self.emit('syntax-changed', s)
555555
# force all panes to redraw
556556
for darea in self.dareas:
557557
darea.queue_draw()
@@ -733,7 +733,7 @@ def setFormat(self, f: int, fmt: LineEnding) -> None:
733733
# create an Undo object for the action
734734
self.addUndo(FileDiffViewerBase.SetFormatUndo(f, fmt, pane.format))
735735
pane.format = fmt
736-
self.emit('format_changed', f, fmt)
736+
self.emit('format-changed', f, fmt)
737737

738738
# Undo for the creation of Line objects
739739
class InstanceLineUndo:
@@ -806,7 +806,7 @@ def updateLineText(self, f, i, is_modified, text):
806806
elif not is_modified and line.is_modified:
807807
pane.num_edits -= 1
808808
if pane.num_edits != old_num_edits:
809-
self.emit('num_edits_changed', f)
809+
self.emit('num-edits-changed', f)
810810
line.is_modified = is_modified
811811
line.modified_text = text
812812
line.compare_string = None
@@ -1061,7 +1061,7 @@ def replaceLines(self, f, lines, new_lines, max_num, new_max_num):
10611061
if line is not None and line.is_modified:
10621062
pane.num_edits += 1
10631063
if pane.num_edits != old_num_edits:
1064-
self.emit('num_edits_changed', f)
1064+
self.emit('num-edits-changed', f)
10651065
del pane.syntax_cache[:]
10661066
pane.max_line_number = new_max_num
10671067
self.dareas[f].queue_draw()
@@ -1541,8 +1541,8 @@ def setEditMode(
15411541
self.setCurrentChar(self.current_line, self.current_char, True)
15421542
else:
15431543
self.setCurrentLine(self.current_pane, self.current_line, self.selection_line)
1544-
self.emit('cursor_changed')
1545-
self.emit('mode_changed')
1544+
self.emit('cursor-changed')
1545+
self.emit('mode-changed')
15461546
# queue a redraw to show the updated selection
15471547
self.dareas[old_f].queue_draw()
15481548

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

1588-
self.emit('cursor_changed')
1588+
self.emit('cursor-changed')
15891589

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

16991699
self._cursor_position_changed(True)
1700-
self.emit('cursor_changed')
1700+
self.emit('cursor-changed')
17011701

17021702
# invalidate old selection area
17031703
self._queue_draw_lines(f, line0, line1)
@@ -1809,7 +1809,7 @@ def darea_button_press_cb(self, widget, event, f):
18091809
self.mode = EditMode.CHAR
18101810
self._im_focus_in()
18111811
self.button_press(f, x, y, False)
1812-
self.emit('mode_changed')
1812+
self.emit('mode-changed')
18131813
elif self.mode == EditMode.CHAR and self.current_pane == f:
18141814
# select word
18151815
text = utils.strip_eol(self.getLineText(f, i))
@@ -2528,7 +2528,7 @@ def _line_mode_enter_align_mode(self):
25282528
self.selection_line = self.current_line
25292529
self.align_pane = self.current_pane
25302530
self.align_line = self.current_line
2531-
self.emit('mode_changed')
2531+
self.emit('mode-changed')
25322532
self.dareas[self.align_pane].queue_draw()
25332533

25342534
# 'first-line' keybinding action
@@ -3102,7 +3102,7 @@ def prefsUpdated(self) -> None:
31023102
for pane in self.panes:
31033103
del pane.diff_cache[:]
31043104
# tab width may have changed
3105-
self.emit('cursor_changed')
3105+
self.emit('cursor-changed')
31063106
for darea in self.dareas:
31073107
darea.queue_draw()
31083108
self.diffmap_cache = None
@@ -3298,7 +3298,7 @@ def swapPanes(self, f_dst: int, f_src: int) -> None:
32983298
# queue redraw
32993299
self.diffmap_cache = None
33003300
self.diffmap.queue_draw()
3301-
self.emit('swapped_panes', f_dst, f_src)
3301+
self.emit('swapped-panes', f_dst, f_src)
33023302

33033303
# swap the contents of two panes
33043304
def swap_panes(self, f_dst: int, f_src: int) -> None:

src/diffuse/window.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def updateTitle(self) -> None:
166166
s = ' '.join(ss)
167167
self.label.set_text(s)
168168
self.label.set_tooltip_text(s)
169-
self.emit('title_changed')
169+
self.emit('title-changed')
170170

171171
# set num edits
172172
def setEdits(self, has_edits: bool) -> None:
@@ -373,7 +373,7 @@ def title_changed_cb(self, widget):
373373
s = self.title
374374
if has_edits:
375375
s += ' *'
376-
self.emit('title_changed', s)
376+
self.emit('title-changed', s)
377377

378378
def setEncoding(self, f, encoding):
379379
h = self.headers[f]
@@ -653,7 +653,7 @@ def updateStatus(self) -> None:
653653
else:
654654
s = None
655655
self.status = s
656-
self.emit('status_changed', s)
656+
self.emit('status-changed', s)
657657

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

0 commit comments

Comments
 (0)