Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a Gtk.Grid instead of a Gtk.Table.

This commit is contained in:
Romain Failliot 2016-07-25 20:35:16 -04:00
parent b058926c52
commit e77d60fd1d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/usr/bin/diffuse
View File

@ -3172,7 +3172,7 @@ def patience_diff(a, b):
return matches return matches
# widget used to compare and merge text files # widget used to compare and merge text files
class FileDiffViewer(Gtk.Table): class FileDiffViewer(Gtk.Grid):
# class describing a text pane # class describing a text pane
class Pane: class Pane:
def __init__(self): def __init__(self):
@ -3223,7 +3223,7 @@ class FileDiffViewer(Gtk.Table):
if n < 2: if n < 2:
raise ValueError('Invalid number of panes') raise ValueError('Invalid number of panes')
Gtk.Table.__init__(self, 3, n + 1) Gtk.Grid.__init__(self)
self.set_can_focus(True) self.set_can_focus(True)
self.prefs = prefs self.prefs = prefs
self.string_width_cache = {} self.string_width_cache = {}
@ -3346,6 +3346,7 @@ class FileDiffViewer(Gtk.Table):
# pane contents # pane contents
sw = ScrolledWindow(self.hadj, self.vadj) sw = ScrolledWindow(self.hadj, self.vadj)
sw.set_hexpand(True)
darea = sw.darea darea = sw.darea
darea.add_events(Gdk.EventMask.BUTTON_PRESS_MASK | darea.add_events(Gdk.EventMask.BUTTON_PRESS_MASK |
Gdk.EventMask.BUTTON1_MOTION_MASK) Gdk.EventMask.BUTTON1_MOTION_MASK)
@ -3353,7 +3354,7 @@ class FileDiffViewer(Gtk.Table):
darea.connect('motion-notify-event', self.darea_motion_notify_cb, i) darea.connect('motion-notify-event', self.darea_motion_notify_cb, i)
darea.connect('draw', self.darea_draw_cb, i) darea.connect('draw', self.darea_draw_cb, i)
self.dareas.append(darea) self.dareas.append(darea)
self.attach(sw, i, i + 1, 1, 2) self.attach(sw, i, 1, 1, 1)
sw.show() sw.show()
self.hadj.connect('value-changed', self.hadj_changed_cb) self.hadj.connect('value-changed', self.hadj_changed_cb)
@ -3368,7 +3369,7 @@ class FileDiffViewer(Gtk.Table):
diffmap.connect('motion-notify-event', self.diffmap_button_press_cb) diffmap.connect('motion-notify-event', self.diffmap_button_press_cb)
diffmap.connect('scroll-event', self.diffmap_scroll_cb) diffmap.connect('scroll-event', self.diffmap_scroll_cb)
diffmap.connect('draw', self.diffmap_draw_cb) diffmap.connect('draw', self.diffmap_draw_cb)
self.attach(diffmap, n, n + 1, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL) self.attach(diffmap, n, 1, 1, 1)
diffmap.show() diffmap.show()
diffmap.set_size_request(16 * n, 0) diffmap.set_size_request(16 * n, 0)
self.add_events(Gdk.EventMask.KEY_PRESS_MASK | self.add_events(Gdk.EventMask.KEY_PRESS_MASK |
@ -7000,7 +7001,7 @@ class Diffuse(Gtk.Window):
# pane header # pane header
w = Diffuse.FileDiffViewer.PaneHeader() w = Diffuse.FileDiffViewer.PaneHeader()
self.headers.append(w) self.headers.append(w)
self.attach(w, i, i + 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL) self.attach(w, i, 0, 1, 1)
w.connect('title-changed', self.title_changed_cb) w.connect('title-changed', self.title_changed_cb)
w.connect('open', self.open_file_button_cb, i) w.connect('open', self.open_file_button_cb, i)
w.connect('reload', self.reload_file_button_cb, i) w.connect('reload', self.reload_file_button_cb, i)
@ -7011,7 +7012,7 @@ class Diffuse(Gtk.Window):
# pane footer # pane footer
w = Diffuse.FileDiffViewer.PaneFooter() w = Diffuse.FileDiffViewer.PaneFooter()
self.footers.append(w) self.footers.append(w)
self.attach(w, i, i + 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL) self.attach(w, i, 2, 1, 1)
w.show() w.show()
self.connect('swapped-panes', self.swapped_panes_cb) self.connect('swapped-panes', self.swapped_panes_cb)