Merge lp:~laszlok/jokosher/main into lp:jokosher

[Laszlo Pandy]

[lp:~laszlok/jokosher/main]

1193. By Laszlo Pandy on 2010-01-26

Fix unicode handling of paths.
This fix only changes the unix module. This same bug needs to be tested on Windows.

=== modified file 'Jokosher/Extension.py'
--- Jokosher/Extension.py	2009-05-29 00:49:54 +0000
+++ Jokosher/Extension.py	2010-01-26 05:33:14 +0000
@@ -145,6 +145,7 @@
 			mainapp -- reference the MainApp Jokosher window.
 		"""
 		self.mainapp = mainapp
+		self.jokosher = mainapp
 		
 		self.CONFIGPATH = os.path.join(EXTENSION_DIR_USER, '../extension-config')
 		self.DATAPATH = os.path.join(EXTENSION_DIR_USER, '../extension-data')
@@ -181,7 +182,11 @@
 			reference to the new menu item.
 		"""
 		extensions_menu = self.mainapp.wTree.get_widget("extensionsmenu").get_submenu()
-		new_menu_item = gtk.MenuItem(menu_item_name)
+		if isinstance(menu_item_name, gtk.MenuItem):
+			new_menu_item = menu_item_name
+		else:
+			new_menu_item = gtk.MenuItem(menu_item_name)
+		
 		new_menu_item.connect("activate", callback_function)
 		extensions_menu.prepend(new_menu_item)
 		new_menu_item.show()
 
=== modified file 'Jokosher/PlatformUtils/Unix.py'
--- Jokosher/PlatformUtils/Unix.py	2009-03-19 23:39:14 +0000
+++ Jokosher/PlatformUtils/Unix.py	2010-01-26 05:33:14 +0000
@@ -23,6 +23,13 @@
 	return urllib.url2pathname(url)
 
 def pathname2url(path):
+	# urllib.pathname2url uses urllib.quote(), which cannot handle unicode.
+	# See http://bugs.python.org/issue1712522 for details.
+	# Basically its fixed in Python 3.0+ because all strings are utf8
+	# and a safe assumption can be made. But here in Python 2.x urllib.quote()
+	# expects *bytes* so we have to convert it explicitly.
+	path = path.encode('utf8')
+	
 	return "file://%s" % urllib.pathname2url(path)
 
 def GetRecordingDefaults():
 
=== modified file 'Jokosher/ui/StatusBar.py'
--- Jokosher/ui/StatusBar.py	2009-11-14 17:58:08 +0000
+++ Jokosher/ui/StatusBar.py	2010-01-26 05:33:14 +0000
@@ -10,6 +10,7 @@
 #-------------------------------------------------------------------------------
 
 import gtk
+import pango
 
 #=========================================================================
 
@@ -24,9 +25,32 @@
 		Creates a new instance of StatusBar with no messages shown.
 		"""
 		gtk.Statusbar.__init__(self)
-		# gtk.Statusbar contains a label inside a frame inside itself
-		self.label = self.get_children()[0].get_children()[0]
-		self.label.set_use_markup(True)
+		# gtk.Statusbar contains a label somewhere inside itself
+		self.label = self.get_label_in_hierarchy()
+		if self.label:
+			self.label.set_use_markup(True)
+		
+	#_____________________________________________________________________
+	
+	def get_label_in_hierarchy(self):
+		"""
+		In Gtk+ 2.19 Statusbar was changed to keep a the Label inside an
+		HBox inside a frame. In previous versions the Label was directly
+		inside the frame. 
+		
+		Here we search the entire container hierarchy and hope it will
+		continue to work even if another container is added in the
+		future.
+		"""
+		unchecked = [self]
+		while unchecked:
+			widget = unchecked.pop(0)
+			if isinstance(widget, gtk.Label):
+				return widget
+			elif isinstance(widget, gtk.Container):
+				unchecked.extend(widget.get_children())
+			
+		return None
 		
 	#_____________________________________________________________________
 
@@ -40,8 +64,13 @@
 		Return:
 			the value of the next valid message ID.
 		"""
+		if not self.label:
+			pango_attr_list, text_without_markup, accel_char = pango.parse_markup(message)
+			message = text_without_markup
+		
 		message_id = self.push(0, message)
-		self.label.set_use_markup(True)
+		if self.label:
+			self.label.set_use_markup(True)
 		return message_id
 	
 	#_____________________________________________________________________
@@ -54,7 +83,8 @@
 			message_id -- numerical id of the message to be removed from the StatusBar.
 		"""
 		self.remove_message(0, message_id)
-		self.label.set_use_markup(True)
+		if self.label:
+			self.label.set_use_markup(True)
 		
 	#_____________________________________________________________________
 
 
=== added file 'extensions/Fullscreen.py'
--- extensions/Fullscreen.py	1970-01-01 00:00:00 +0000
+++ extensions/Fullscreen.py	2010-01-26 05:33:14 +0000
@@ -0,0 +1,22 @@
+import Jokosher.Extension
+import gtk
+
+EXTENSION_NAME = "Fullscreen"
+EXTENSION_DESCRIPTION = "Make the Jokosher window fullscreen"
+EXTENSION_VERSION = "1"
+
+API = None
+
+def do_fullscreen(menu_item):
+	if menu_item.get_active():
+		API.jokosher.window.fullscreen()
+	else:
+		API.jokosher.window.unfullscreen()
+
+def startup(api):
+	global API
+	API = api
+	api.add_menu_item(gtk.CheckMenuItem("View fullscreen"), do_fullscreen)
+	
+def shutdown():
+	pass