Skip to content

Commit 9ecd1d6

Browse files
committed
filediff: Improve revert dialog file list display
Two changes here: firstly to use the message dialog area that *is* now available; and secondly to use unicode list bullets.
1 parent e8a53ea commit 9ecd1d6

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

data/ui/filediff.ui

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -834,8 +834,7 @@
834834
<property name="skip_taskbar_hint">True</property>
835835
<property name="message_type">question</property>
836836
<property name="text" translatable="yes">Revert unsaved changes to documents?</property>
837-
<property name="secondary_text" translatable="yes">Changes made to the following documents will be permanently lost:
838-
</property>
837+
<property name="secondary_text" translatable="yes">Changes made to the following documents will be permanently lost:</property>
839838
<child internal-child="vbox">
840839
<object class="GtkBox" id="dialog-vbox2">
841840
<property name="visible">True</property>

meld/filediff.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,10 +1711,13 @@ def check_unsaved_changes(self):
17111711

17121712
dialog = Component("filediff.ui", "revert_dialog")
17131713
dialog.widget.set_transient_for(self.widget.get_toplevel())
1714-
# FIXME: Should be packed into dialog.widget.get_message_area(),
1715-
# but this is unbound on currently required PyGTK.
1716-
filelist = "\n".join(["\t" + f for f in unsaved])
1717-
dialog.widget.props.secondary_text += filelist
1714+
1715+
filelist = Gtk.Label("\n".join(["\t• " + f for f in unsaved]))
1716+
filelist.props.xalign = 0.0
1717+
filelist.show()
1718+
message_area = dialog.widget.get_message_area()
1719+
message_area.pack_start(filelist, expand=False, fill=True, padding=0)
1720+
17181721
response = dialog.widget.run()
17191722
dialog.widget.destroy()
17201723
return response == Gtk.ResponseType.OK

0 commit comments

Comments
 (0)