X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=contrib%2Fgitview%2Fgitview;h=781badbc5ba456008b6ae2b01dc970b5bd2d9c6c;hb=ea92f41ff92b2fef54c8da4abb03c8101160a034;hp=1d042e3aa74dce29e6ed67b1b15d3ccefc8de6c3;hpb=68d55b83a58a68fc1c9cef63f0deccbff3251096;p=git.git

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index 1d042e3a..781badbc 100755
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -162,7 +162,7 @@ class CellRendererGraph(gtk.GenericCellRenderer):
 			for item in names:
 				names_len += len(item)
 
-		width = box_size * (cols + 1 ) + names_len 
+		width = box_size * (cols + 1 ) + names_len
 		height = box_size
 
 		# FIXME I have no idea how to use cell_area properly
@@ -239,20 +239,23 @@ class CellRendererGraph(gtk.GenericCellRenderer):
 				box_size / 4, 0, 2 * math.pi)
 
 
+		self.set_colour(ctx, colour, 0.0, 0.5)
+		ctx.stroke_preserve()
+
+		self.set_colour(ctx, colour, 0.5, 1.0)
+		ctx.fill_preserve()
+
 		if (len(names) != 0):
 			name = " "
 			for item in names:
 				name = name + item + " "
 
-			ctx.select_font_face("Monospace")
 			ctx.set_font_size(13)
-			ctx.text_path(name)
-
-		self.set_colour(ctx, colour, 0.0, 0.5)
-		ctx.stroke_preserve()
-
-		self.set_colour(ctx, colour, 0.5, 1.0)
-		ctx.fill()
+			if (flags & 1):
+				self.set_colour(ctx, colour, 0.5, 1.0)
+			else:
+				self.set_colour(ctx, colour, 0.0, 0.5)
+			ctx.show_text(name)
 
 class Commit:
 	""" This represent a commit object obtained after parsing the git-rev-list
@@ -261,11 +264,11 @@ class Commit:
 	children_sha1 = {}
 
 	def __init__(self, commit_lines):
-		self.message 		= ""
+		self.message		= ""
 		self.author		= ""
-		self.date 		= ""
-		self.committer 		= ""
-		self.commit_date 	= ""
+		self.date		= ""
+		self.committer		= ""
+		self.commit_date	= ""
 		self.commit_sha1	= ""
 		self.parent_sha1	= [ ]
 		self.parse_commit(commit_lines)
@@ -365,7 +368,7 @@ class DiffWindow:
 		save_menu.connect("activate", self.save_menu_response, "save")
 		save_menu.show()
 		menu_bar.append(save_menu)
-		vbox.pack_start(menu_bar, False, False, 2)
+		vbox.pack_start(menu_bar, expand=False, fill=True)
 		menu_bar.show()
 
 		scrollwin = gtk.ScrolledWindow()
@@ -426,7 +429,7 @@ class GitView:
 
 	def __init__(self, with_diff=0):
 		self.with_diff = with_diff
-		self.window =  	gtk.Window(gtk.WINDOW_TOPLEVEL)
+		self.window =	gtk.Window(gtk.WINDOW_TOPLEVEL)
 		self.window.set_border_width(0)
 		self.window.set_title("Git repository browser")
 
@@ -479,19 +482,10 @@ class GitView:
 
 	def construct(self):
 		"""Construct the window contents."""
+		vbox = gtk.VBox()
 		paned = gtk.VPaned()
 		paned.pack1(self.construct_top(), resize=False, shrink=True)
 		paned.pack2(self.construct_bottom(), resize=False, shrink=True)
-		self.window.add(paned)
-		paned.show()
-
-
-	def construct_top(self):
-		"""Construct the top-half of the window."""
-		vbox = gtk.VBox(spacing=6)
-		vbox.set_border_width(12)
-		vbox.show()
-
 		menu_bar = gtk.MenuBar()
 		menu_bar.set_pack_direction(gtk.PACK_DIRECTION_RTL)
 		help_menu = gtk.MenuItem("Help")
@@ -503,11 +497,23 @@ class GitView:
 		help_menu.set_submenu(menu)
 		help_menu.show()
 		menu_bar.append(help_menu)
-		vbox.pack_start(menu_bar, False, False, 2)
 		menu_bar.show()
+		vbox.pack_start(menu_bar, expand=False, fill=True)
+		vbox.pack_start(paned, expand=True, fill=True)
+		self.window.add(vbox)
+		paned.show()
+		vbox.show()
+
+
+	def construct_top(self):
+		"""Construct the top-half of the window."""
+		vbox = gtk.VBox(spacing=6)
+		vbox.set_border_width(12)
+		vbox.show()
+
 
 		scrollwin = gtk.ScrolledWindow()
-		scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+		scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 		scrollwin.set_shadow_type(gtk.SHADOW_IN)
 		vbox.pack_start(scrollwin, expand=True, fill=True)
 		scrollwin.show()
@@ -792,7 +798,7 @@ class GitView:
 			button.set_relief(gtk.RELIEF_NONE)
 			button.set_sensitive(True)
 			button.connect("clicked", self._show_clicked_cb,
-					child_id, commit.commit_sha1)
+					child_id, commit.commit_sha1, self.encoding)
 			hbox.pack_start(button, expand=False, fill=True)
 			button.show()
 
@@ -878,15 +884,15 @@ class GitView:
 
 		# Reset nodepostion
 		if (last_nodepos > 5):
-			last_nodepos = -1 
+			last_nodepos = -1
 
 		# Add the incomplete lines of the last cell in this
 		try:
 			colour = self.colours[commit.commit_sha1]
 		except KeyError:
 			self.colours[commit.commit_sha1] = last_colour+1
-			last_colour = self.colours[commit.commit_sha1] 
-			colour =   self.colours[commit.commit_sha1] 
+			last_colour = self.colours[commit.commit_sha1]
+			colour =   self.colours[commit.commit_sha1]
 
 		try:
 			node_pos = self.nodepos[commit.commit_sha1]
@@ -918,7 +924,7 @@ class GitView:
 				self.colours[parent_id] = last_colour+1
 				last_colour = self.colours[parent_id]
 				self.nodepos[parent_id] = last_nodepos+1
-				last_nodepos = self.nodepos[parent_id] 
+				last_nodepos = self.nodepos[parent_id]
 
 			in_line.append((node_pos, self.nodepos[parent_id],
 						self.colours[parent_id]))
@@ -954,7 +960,7 @@ class GitView:
 			try:
 				next_commit = self.commits[index+1]
 				if (next_commit.commit_sha1 == sha1 and pos != int(pos)):
-				# join the line back to the node point 
+				# join the line back to the node point
 				# This need to be done only if we modified it
 					in_line.append((pos, pos-0.5, self.colours[sha1]))
 					continue;