Fixes LP:229789 Defaults to unwrapped. Jasper
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # testament_sha1: d7229a8a97df245c63286f6227e1a9c8c4ec7584 # timestamp: 2008-07-20 14:55:09 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'diff.py' --- diff.py 2008-07-17 11:24:26 +0000 +++ diff.py 2008-07-20 12:53:30 +0000 @@ -73,15 +73,15 @@ self.buffer.set_language(gsl) self.buffer.set_highlight(True) - sourceview = gtksourceview.SourceView(self.buffer) + self.sourceview = gtksourceview.SourceView(self.buffer) else: self.buffer = gtk.TextBuffer() - sourceview = gtk.TextView(self.buffer) + self.sourceview = gtk.TextView(self.buffer) - sourceview.set_editable(False) - sourceview.modify_font(pango.FontDescription("Monospace")) - self.add(sourceview) - sourceview.show() + self.sourceview.set_editable(False) + self.sourceview.modify_font(pango.FontDescription("Monospace")) + self.add(self.sourceview) + self.sourceview.show() @staticmethod def apply_gedit_colors(lang): @@ -300,12 +300,19 @@ super(DiffWidget, self).__init__() # The file hierarchy: a scrollable treeview + vbox = gtk.VBox() + self.checkbox_wraplines = gtk.CheckButton(_i18n("W_rap long lines"), True) + self.checkbox_wraplines.set_active(False) # TO DO: Read from config + self.checkbox_wraplines.connect("toggled", self._on_wraplines_toggled) + self.checkbox_wraplines.show() scrollwin = gtk.ScrolledWindow() scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) scrollwin.set_shadow_type(gtk.SHADOW_IN) - self.pack1(scrollwin) scrollwin.show() - + vbox.pack_start(scrollwin, True, True, 0) + vbox.pack_end(self.checkbox_wraplines, False, False, 5) + self.pack1(vbox) + self.model = gtk.TreeStore(str, str) self.treeview = gtk.TreeView(self.model) self.treeview.set_headers_visible(False) @@ -405,9 +412,15 @@ return elif specific_files == [ "" ]: specific_files = None - + self.diff_view.show_diff(specific_files) - + + def _on_wraplines_toggled(self, widget): + """Callback for when the wrap lines checkbutton is toggled""" + if self.checkbox_wraplines.get_active(): + self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD) + else: + self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE) class DiffWindow(Window): """Diff window.
=== modified file 'viz/branchwin.py'
--- viz/branchwin.py 2008-07-18 15:19:21 +0000
+++ viz/branchwin.py 2008-07-20 12:53:30 +0000
@@ -57,15 +57,16 @@
self.set_title(branch.nick + " - revision history")
- # Use three-quarters of the screen by default
- screen = self.get_screen()
- monitor = screen.get_monitor_geometry(0)
- width = int(monitor.width * 0.75)
- height = int(monitor.height * 0.75)
# user-configured window size
size = self._load_size('viz-window-size')
if size:
width, height = size
+ else:
+ # Use three-quarters of the screen by default
+ screen = self.get_screen()
+ monitor = screen.get_monitor_geometry(0)
+ width = int(monitor.width * 0.75)
+ height = int(monitor.height * 0.75)
self.set_default_size(width, height)
self.set_size_request(width/3, height/3)
self.connect("size-allocate", self._on_size_allocate, 'viz-window-size')
# Begin bundle
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
o07N5yHYGci9NLgdIGyZuTKf/F3JFOFCQiZZUnw=
signature.asc
Description: OpenPGP digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
