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

Change GTK base class of some classes. 

* Gtk.Table is obsolete, using Gtk.Grid instead.
* Gtk.HBox is obsolete, using Gtk.Box instead.
This commit is contained in:
Romain Failliot 2016-08-17 21:38:28 -04:00
parent 5cbaec21f8
commit 28a008ac0b
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/usr/bin/diffuse
View File

@ -2681,13 +2681,14 @@ def step_adjustment(adj, delta):
# handled immediately after changing the viewport position. This could cause # handled immediately after changing the viewport position. This could cause
# the application to become unresponsive for a while as it processed a large # the application to become unresponsive for a while as it processed a large
# queue of keypress and expose event pairs. # queue of keypress and expose event pairs.
class ScrolledWindow(Gtk.Table): class ScrolledWindow(Gtk.Grid):
scroll_directions = set((Gdk.ScrollDirection.UP, scroll_directions = set((Gdk.ScrollDirection.UP,
Gdk.ScrollDirection.DOWN, Gdk.ScrollDirection.DOWN,
Gdk.ScrollDirection.LEFT, Gdk.ScrollDirection.LEFT,
Gdk.ScrollDirection.RIGHT)) Gdk.ScrollDirection.RIGHT))
def __init__(self, hadj, vadj): def __init__(self, hadj, vadj):
Gtk.Table.__init__(self, 2, 2) Gtk.Grid.__init__(self)
self.position = (0, 0) self.position = (0, 0)
self.scroll_count = 0 self.scroll_count = 0
self.partial_redraw = False self.partial_redraw = False
@ -2703,15 +2704,17 @@ class ScrolledWindow(Gtk.Table):
darea.queue_draw_area = self.redraw_region darea.queue_draw_area = self.redraw_region
vport.add(darea) vport.add(darea)
darea.show() darea.show()
self.attach(vport, 0, 1, 0, 1) self.attach(vport, 0, 0, 1, 1)
vport.set_vexpand(True)
vport.set_hexpand(True)
vport.show() vport.show()
self.vbar = bar = Gtk.VScrollbar.new(vadj) self.vbar = bar = Gtk.VScrollbar.new(vadj)
self.attach(bar, 1, 2, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL) self.attach(bar, 1, 0, 1, 1)
bar.show() bar.show()
self.hbar = bar = Gtk.HScrollbar.new(hadj) self.hbar = bar = Gtk.HScrollbar.new(hadj)
self.attach(bar, 0, 1, 1, 2, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL) self.attach(bar, 0, 1, 1, 1)
bar.show() bar.show()
# listen to our signals # listen to our signals
@ -3346,6 +3349,7 @@ class FileDiffViewer(Gtk.Grid):
# pane contents # pane contents
sw = ScrolledWindow(self.hadj, self.vadj) sw = ScrolledWindow(self.hadj, self.vadj)
sw.set_vexpand(True)
sw.set_hexpand(True) 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 |
@ -6880,9 +6884,9 @@ class Diffuse(Gtk.Window):
# specialisation of FileDiffViewer for Diffuse # specialisation of FileDiffViewer for Diffuse
class FileDiffViewer(FileDiffViewer): class FileDiffViewer(FileDiffViewer):
# pane header # pane header
class PaneHeader(Gtk.HBox): class PaneHeader(Gtk.Box):
def __init__(self): def __init__(self):
Gtk.HBox.__init__(self) Gtk.Box.__init__(self, Gtk.Orientation.HORIZONTAL, 0)
appendButtons(self, Gtk.IconSize.MENU, [ appendButtons(self, Gtk.IconSize.MENU, [
[ Gtk.STOCK_OPEN, self.button_cb, 'open', _('Open File...') ], [ Gtk.STOCK_OPEN, self.button_cb, 'open', _('Open File...') ],
[ Gtk.STOCK_REFRESH, self.button_cb, 'reload', _('Reload File') ], [ Gtk.STOCK_REFRESH, self.button_cb, 'reload', _('Reload File') ],
@ -6894,13 +6898,13 @@ class Diffuse(Gtk.Window):
label.set_max_width_chars(1) label.set_max_width_chars(1)
self.pack_start(label, True, True, 0) self.pack_start(label, True, True, 0)
label.show()
# file's name and information about how to retrieve it from a # file's name and information about how to retrieve it from a
# VCS # VCS
self.info = FileInfo() self.info = FileInfo()
self.has_edits = False self.has_edits = False
self.updateTitle() self.updateTitle()
self.show_all()
# callback for buttons # callback for buttons
def button_cb(self, widget, s): def button_cb(self, widget, s):
@ -6932,35 +6936,31 @@ class Diffuse(Gtk.Window):
self.updateTitle() self.updateTitle()
# pane footer # pane footer
class PaneFooter(Gtk.HBox): class PaneFooter(Gtk.Box):
def __init__(self): def __init__(self):
Gtk.HBox.__init__(self) Gtk.Box.__init__(self, Gtk.Orientation.HORIZONTAL, 0)
self.cursor = label = Gtk.Label.new() self.cursor = label = Gtk.Label.new()
self.cursor.set_size_request(-1, -1)
self.pack_start(label, False, False, 0) self.pack_start(label, False, False, 0)
label.show()
separator = Gtk.VSeparator.new() separator = Gtk.VSeparator.new()
self.pack_end(separator, False, False, 10) self.pack_end(separator, False, False, 10)
separator.show()
self.encoding = label = Gtk.Label.new() self.encoding = label = Gtk.Label.new()
self.pack_end(label, False, False, 0) self.pack_end(label, False, False, 0)
label.show()
separator = Gtk.VSeparator.new() separator = Gtk.VSeparator.new()
self.pack_end(separator, False, False, 10) self.pack_end(separator, False, False, 10)
separator.show()
self.format = label = Gtk.Label.new() self.format = label = Gtk.Label.new()
self.pack_end(label, False, False, 0) self.pack_end(label, False, False, 0)
label.show()
separator = Gtk.VSeparator.new() separator = Gtk.VSeparator.new()
self.pack_end(separator, False, False, 10) self.pack_end(separator, False, False, 10)
separator.show()
self.set_size_request(0, self.get_size_request()[1]) self.set_size_request(0, self.get_size_request()[1])
self.show_all()
# set the cursor label # set the cursor label
def updateCursor(self, viewer, f): def updateCursor(self, viewer, f):