Merge lp:~kamstrup/gnome-zeitgeist/gnome-zeitgeist-run-uninstalled into lp:gnome-zeitgeist

[Mikkel Kamstrup Erlandsen]

[Mikkel Kamstrup Erlandsen (kamstrup)]

This branch makes it possible to run the journal without installing it - that is, directly from the source dir

Unmerged revisions

754. By Mikkel Kamstrup Erlandsen on 2009-06-16

Merge with trunk

753. By Mikkel Kamstrup Erlandsen on 2009-06-04

Apply changes necessary to run zeitgeist uninstalled, directly from a (compiled) source checkout

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2009-06-11 14:02:56 +0000
+++ data/Makefile.am	2009-06-16 10:25:12 +0000
@@ -1,5 +1,8 @@
 SUBDIRS = logo
 
+pixmapdir = $(datadir)
+pixmap_DATA = gnome-zeitgeist.xpm
+
 pkgdata_DATA = \
 	bookmark-new.svg \
 	calendar.svg \

=== renamed file 'data/logo/gnome-zeitgeist.png' => 'data/gnome-zeitgeist.png'
=== renamed file 'data/logo/gnome-zeitgeist.xpm' => 'data/gnome-zeitgeist.xpm'
=== modified file 'data/logo/Makefile.am'
--- data/logo/Makefile.am	2009-05-24 21:38:30 +0000
+++ data/logo/Makefile.am	2009-06-04 21:49:42 +0000
@@ -1,6 +1,3 @@
-pixmapdir = $(datadir)
-pixmap_DATA = gnome-zeitgeist.xpm
-
 hicolordir = $(datadir)/icons/hicolor
 tango_icons = \
 	22x22/apps/gnome-zeitgeist.png \

=== modified file 'zeitgeist-journal'
--- zeitgeist-journal	2009-05-23 21:49:10 +0000
+++ zeitgeist-journal	2009-06-04 21:49:42 +0000
@@ -24,7 +24,7 @@
 		# Window
 		self.set_title("GNOME Zeitgeist")
 		self.set_resizable(True)
-		self.set_icon_from_file("%s/scalable/apps/gnome-zeitgeist.svg" % config.hicolordir)
+		self.set_icon(icon_factory.load_icon("gnome-zeitgeist.png", 192))
 		self._visible = True
 		self.connect("destroy", gtk.main_quit)
 		self.connect_after("check-resize", self.window_state_event_cb)
@@ -59,8 +59,7 @@
 		self.notebook.append_page(bookmarks, label)
 		self.notebook.set_tab_label_packing(bookmarks, True, True, gtk.PACK_START)
 		
-		journal = "%s/calendar.svg" % config.pkgdatadir
-		label = self.create_tab_label(_("Journal"), journal)
+		label = self.create_tab_label(_("Journal"), "calendar.svg")
 		self.notebook.append_page(timeline, label)
 		self.notebook.set_tab_label_packing(timeline, True, True, gtk.PACK_START)
 		
@@ -105,7 +104,7 @@
 	
 	def _create_toolbar_buttons(self):
 		self.star_button = gtk.ToggleToolButton()
-		pixbuf = gtk.gdk.pixbuf_new_from_file_at_size("%s/bookmark-new.svg" % config.pkgdatadir, 24, 24)
+		pixbuf = icon_factory.load_icon("bookmark-new.svg", 24)
 		self.star_button.set_icon_widget(gtk.image_new_from_pixbuf(pixbuf))
 		self.star_button.set_label(_("Stars"))
 		self.star_button.set_tooltip_text(_("Stars"))

=== modified file 'zeitgeist/gui/zeitgeist_journal_widgets.py'
--- zeitgeist/gui/zeitgeist_journal_widgets.py	2009-06-15 17:50:28 +0000
+++ zeitgeist/gui/zeitgeist_journal_widgets.py	2009-06-16 10:25:12 +0000
@@ -752,8 +752,7 @@
 		self.home.connect("clicked", timeline.reset_date)
 		
 		self.search = gtk.ToggleToolButton()
-		pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(
-			"%s/32x32/apps/gnome-zeitgeist.png" % config.hicolordir, 24, 24)
+		pixbuf = icon_factory.load_icon("gnome-zeitgeist.png", 24)
 		self.search.set_icon_widget(gtk.image_new_from_pixbuf(pixbuf))
 		self.search.set_label(_("Search"))
 		self.search.set_tooltip_text(_("Search for activities"))
@@ -802,17 +801,17 @@
 		
 		gtk.Notebook.__init__(self)
 		
-		label = self.create_tab_label(_("Tags"), htb)
+		label = self.create_tab_label(_("Tags"))
 		self.append_page(htb, label)
 		self.set_tab_label_packing(htb, True, True, gtk.PACK_START)
 		
-		label = self.create_tab_label(_("Calendar"), calendar)
+		label = self.create_tab_label(_("Calendar"))
 		self.append_page(calendar, label)
 		self.set_tab_label_packing(calendar, True, True, gtk.PACK_START)
 		
 		vbox = gtk.VBox()
 		#vbox.pack_start(calendar, False, False)
-		label = self.create_tab_label(_("Filters"), vbox)
+		label = self.create_tab_label(_("Filters"))
 		enable_grouping = gtk.CheckButton()
 		enable_grouping.set_label(_("Enable Grouping"))
 		enable_grouping.set_active(True)
@@ -831,12 +830,14 @@
 		timeline.group = widget.get_active()
 		timeline.load_month()
 	
-	def create_tab_label(self, title, stock):
-		icon = gtk.image_new_from_pixbuf(icon_factory.load_icon(stock, icon_size = 16 ,cache = False))
-		label = gtk.Label(title)
+	def create_tab_label(self, title, stock=None):
+		box = gtk.HBox()
+
+		if stock:
+			icon = gtk.image_new_from_pixbuf(icon_factory.load_icon(stock, icon_size = 16 ,cache = False))
+			box.pack_start(icon, False, False)
 		
-		box = gtk.HBox()	
-		box.pack_start(icon, False, False)
+		label = gtk.Label(title)		
 		box.pack_start(label, True, True)
 		box.show_all()
 		

=== modified file 'zeitgeist/gui/zeitgeist_util.py'
--- zeitgeist/gui/zeitgeist_util.py	2009-06-13 13:17:10 +0000
+++ zeitgeist/gui/zeitgeist_util.py	2009-06-16 10:25:12 +0000
@@ -5,6 +5,7 @@
 """
 
 import os
+import sys
 import gtk
 import gnome.ui
 import gobject
@@ -184,6 +185,14 @@
 											  icon_size)
 			if retval:
 				return retval
+		
+		# We couldn't find the icon anywhere, try seeing if we are
+		# running uninstalled and load it from the source dir if so
+		srcdir = os.path.join(os.path.dirname(__file__), "..", "..")
+		if os.path.exists(os.path.join(srcdir, "configure.ac")):
+			return self.load_icon_from_path(os.path.join(srcdir, "data", icon_value),
+											icon_size)
+
 		return None
 	
 	def transparentize(self, pixbuf, percent):
@@ -195,47 +204,49 @@
 	
 	def greyscale(self, pixbuf):
 		pixbuf = pixbuf.copy()
-	        for row in pixbuf.get_pixels_array():
-	            for pix in row:
-	                pix[0] = pix[1] = pix[2] = (int(pix[0]) + int(pix[1]) + int(pix[2])) / 3
+		for row in pixbuf.get_pixels_array():
+			for pix in row:
+				pix[0] = pix[1] = pix[2] = (int(pix[0]) + int(pix[1]) + int(pix[2])) / 3
 		return pixbuf
 	
 	def load_icon(self, icon_value, icon_size, force_size=True, cache=True):
-		if not self.icon_dict.has_key(icon_value) or not cache:
-			try:
-				if isinstance(icon_value, gtk.gdk.Pixbuf):
-					return icon_value
-				elif os.path.isabs(icon_value):
-					icon = self.load_icon_from_path(icon_value, icon_size)
-					if icon:
-						return icon
-					icon_name = os.path.basename(icon_value)
-				else:
-					icon_name = icon_value
-				
-				if icon_name.endswith(".png"):
-					icon_name = icon_name[:-len(".png")]
-				elif icon_name.endswith(".xpm"):
-					icon_name = icon_name[:-len(".xpm")]
-				elif icon_name.endswith(".svg"):
-					icon_name = icon_name[:-len(".svg")]
-				
-				icon = None
-				info = icon_theme.lookup_icon(icon_name, icon_size, gtk.ICON_LOOKUP_USE_BUILTIN)
-				if info:
-					if icon_name.startswith("gtk-"):
-						icon = info.load_icon()
-					elif info.get_filename():
-						icon = self.load_icon_from_path(info.get_filename(), icon_size)
-				else:
-					icon = self.load_icon_from_data_dirs(icon_value, icon_size) 
-				
-				if cache:
-					self.icon_dict[icon_value] = icon
-				return icon
-			except Exception:
-				self.icon_dict[icon_value] = None
-				return None
+		if not self.icon_dict.has_key(icon_value) or cache==False:
+			#print "creating icon for "+icon_value
+			if isinstance(icon_value, gtk.gdk.Pixbuf):
+				return icon_value
+			
+			if os.path.isabs(icon_value):
+				icon = self.load_icon_from_path(icon_value, icon_size)
+				if icon:
+					return icon
+				icon_name = os.path.basename(icon_value)
+			else:
+				icon_name = icon_value
+			
+			if icon_name.endswith(".png"):
+				icon_name = icon_name[:-len(".png")]
+			elif icon_name.endswith(".xpm"):
+				icon_name = icon_name[:-len(".xpm")]
+			elif icon_name.endswith(".svg"):
+				icon_name = icon_name[:-len(".svg")]
+			
+			icon = None
+			info = icon_theme.lookup_icon(icon_name, icon_size, gtk.ICON_LOOKUP_USE_BUILTIN)
+			if info:
+				if icon_name.startswith("gtk-"):
+					icon = info.load_icon()
+				elif info.get_filename():
+					icon = self.load_icon_from_path(info.get_filename(), icon_size)
+			else:
+				icon = self.load_icon_from_data_dirs(icon_value, icon_size) 
+			
+			if cache:
+				self.icon_dict[icon_value] = icon
+			
+			if not icon:
+				raise IOError("Failed to find icon '%s'" % icon_value)
+			
+			return icon
 		else:
 			return self.icon_dict[icon_value]
 	

=== modified file 'zeitgeist/gui/zeitgeist_util_widgets.py'
--- zeitgeist/gui/zeitgeist_util_widgets.py	2009-06-12 15:47:09 +0000
+++ zeitgeist/gui/zeitgeist_util_widgets.py	2009-06-16 10:25:12 +0000
@@ -56,8 +56,7 @@
 		
 		self.fromImage = [ ( "text/plain", 0, TARGET_TYPE_TEXT ), ( "image/x-xpixmap", 0, TARGET_TYPE_PIXMAP ) ]
 		
-		self.active_image = gtk.gdk.pixbuf_new_from_file_at_size(
-			"%s/bookmark-new.svg" % config.pkgdatadir, 24, 24) 
+		self.active_image = icon_factory.load_icon("bookmark-new.svg", 24) 
 		
 		self.inactive_image = icon_factory.greyscale(self.active_image)
 		self.inactive_image = icon_factory.transparentize(self.inactive_image,50)