Merge lp:~psquid/heybuddy/maemo_tweaks into lp:heybuddy

[Psychedelic Squid]

This branch contains the fix for actually making submitting work on Maemo.

Also, as of this resubmitted proposal:

Some new Maemo tweaks: collapsible info sections for groups/users, and close buttons in tab titles (for closeable tabs only), rather than a separate button at the bottom of the tab.

Only possible issue I can see is with the close buttons; they do make the tab bar a few pixels taller when a closeable tab is open. Haven't figured out how/if it's possible to have it keep a constant height.

[jezra (jezra)]

shit yea, boyeeeeee!

review: Approve

[lp:~psquid/heybuddy/maemo_tweaks]

272. By Psychedelic Squid on 2011-05-05

Do some hackery to keep the tabbar height from fluctuating.

[jezra (jezra)]

review: Approve

Unmerged revisions

272. By Psychedelic Squid on 2011-05-05

Do some hackery to keep the tabbar height from fluctuating.

271. By Psychedelic Squid on 2011-05-05

Close buttons in tab header for all closeable tabs, rather than at the bottom of the tab. Saves a lot of space.

270. By Psychedelic Squid on 2011-05-04

Collapsible info-area for groups/users. This makes it possible to actually see a sensible amount of dents on small screens (e.g., maemo) when the bio is long.

269. By Psychedelic Squid on 2011-05-04

Restore Maemo devices' ability to submit dents.

=== modified file 'ContextPage.py'
--- ContextPage.py	2010-10-09 06:14:56 +0000
+++ ContextPage.py	2011-05-05 04:39:25 +0000
@@ -14,13 +14,6 @@
 	}
 	def __init__(self):
 		ScrollPage.__init__(self)
-		#we do need a close button
-		close_button=gtk.Button(_("Close"))
-		hbox = gtk.HBox(False)
-		hbox.pack_start(close_button,False,False,0)
-		close_button.connect('clicked',self.close)
-		self.pack_end(hbox,False,False,0)
-		
 	
 	def close(self,button):
 		#we can just hid ourself

=== modified file 'GroupPage.py'
--- GroupPage.py	2011-04-11 18:31:17 +0000
+++ GroupPage.py	2011-05-05 04:39:25 +0000
@@ -3,6 +3,7 @@
 copyright 2010 jezra lickter http://www.jezra.net
 '''
 from DentScroller import DentScroller
+from DentButton import DentButton
 import gtk,gobject
 from PlatformSpecific import links_unavailable
 class GroupPage(gtk.VBox,gobject.GObject):
@@ -32,11 +33,11 @@
 		imagevbox.pack_start(self.image,False,False,0)
 
 		#make an hbox to hold image and group info
-		grouphbox=gtk.HBox(False,5)
-		self.pack_start(grouphbox,False,False,0)
-		grouphbox.pack_start(imagevbox,False,False,0)
+		self.grouphbox=gtk.HBox(False,5)
+		self.pack_start(self.grouphbox,False,False,0)
+		self.grouphbox.pack_start(imagevbox,False,False,0)
 		infovbox = gtk.VBox(False)
-		grouphbox.pack_start(infovbox,False,False)
+		self.grouphbox.pack_start(infovbox,False,False)
 		
 		self.name_label = gtk.Label()
 		infovbox.pack_start(self.name_label,False,False,0)
@@ -53,27 +54,45 @@
 		self.location_label = gtk.Label()
 		infovbox.pack_start(self.location_label,False,False,0)
 		
+		#widget box for the horizontal stuff
+		self.widgetbox = gtk.HBox(False)
+		self.pack_start(self.widgetbox,False,False,0)
+		
 		#make a checkbutton if we are following
 		self.joined_checkbutton = gtk.CheckButton(_("joined"))
 		self.joined_checkbutton.connect('toggled', self.joined_toggled)
-		infovbox.pack_start(self.joined_checkbutton,False,False,0)
+		self.widgetbox.pack_start(self.joined_checkbutton,False,False,0)
+		
+		#collapse button
+		collapsebox = gtk.Alignment(xalign=1.0)
+		self.collapse_button = DentButton(u'\u25b2')
+		self.collapse_button.connect('clicked',self.collapse_clicked)
+		collapsebox.add(self.collapse_button)
+		self.widgetbox.pack_end(collapsebox,True,True,0)
+		
+		#collapsed widget box and name label
+		self.widgetbox_collapsed = gtk.HBox(False)
+		self.name_label_collapsed = gtk.Label()
+		self.widgetbox_collapsed.pack_start(self.name_label_collapsed,False,False,0)
+		#its expand button
+		expandbox = gtk.Alignment(xalign=1.0)
+		self.expand_button = DentButton(u'\u25bc')
+		self.expand_button.connect('clicked',self.expand_clicked)
+		expandbox.add(self.expand_button)
+		self.widgetbox_collapsed.pack_end(expandbox,True,True,0)
+		#pack it up
+		self.pack_start(self.widgetbox_collapsed,False,False,0)
 		
 		#create a group dent scroller and add it to the group page
 		self.dentScroller = DentScroller()
 		self.pack_start(self.dentScroller)
 		
-		#make a "close" button
-		hbox = gtk.HBox(False)
-		user_close_button=gtk.Button(_("Close"))
-		hbox.pack_start(user_close_button,False,False,0)
-		user_close_button.connect('clicked',self.close)
-		self.pack_end(hbox,False,False,0)
-		
 	def set_group_data(self,data):
 		self.joined_checkbutton.set_sensitive(True)
 		self.group_id= data['id']
 		self.group_name = data['fullname']
 		self.name_label.set_text("%s" %(data['fullname']) )
+		self.name_label_collapsed.set_text("%s" %(data['fullname']) )
 		if data['location']!=None:
 			self.location_label.set_text("%s: %s" %(_("Location"), data['location']) )
 			self.location_label.show()
@@ -122,6 +141,16 @@
 		#self.hide()
 		self.emit('group-page-hide')
 		
+	def collapse_clicked(self,widget):
+		self.grouphbox.hide()
+		self.widgetbox.hide()
+		self.widgetbox_collapsed.show()
+	
+	def expand_clicked(self,widget):
+		self.grouphbox.show()
+		self.widgetbox.show()
+		self.widgetbox_collapsed.hide()
+	
 	def process_link(self, label, uri ):
 		self.emit('open-link', uri )
 		return True

=== modified file 'UserPage.py'
--- UserPage.py	2011-04-11 18:31:17 +0000
+++ UserPage.py	2011-05-05 04:39:25 +0000
@@ -61,47 +61,60 @@
 		labelvbox.pack_start(self.location_label,False,False,0)
 		labelvbox.pack_start(self.url_label,False,False,0)
 		#make an hbox to hold the image and labels
-		userhbox=gtk.HBox(False,5)
+		self.userhbox=gtk.HBox(False,5)
 		#make an hbox to hold widgets
-		widgetbox = gtk.HBox(False)
+		self.widgetbox = gtk.HBox(False)
 		#add the imagevbox
-		userhbox.pack_start(imagevbox,False,False,0)
-		userhbox.pack_start(labelvbox,False,False,0)
-		self.pack_start(userhbox,False,False,0)
-		self.pack_start(widgetbox,False,False,0)
+		self.userhbox.pack_start(imagevbox,False,False,0)
+		self.userhbox.pack_start(labelvbox,False,False,0)
+		self.pack_start(self.userhbox,False,False,0)
+		self.pack_start(self.widgetbox,False,False,0)
 		#make a checkbutton if we are following
 		self.following_checkbutton = gtk.CheckButton(_("Following"))
 		self.following_checkbutton.connect('toggled', self.following_toggled)
-		widgetbox.pack_start(self.following_checkbutton,False,False,0)
+		self.widgetbox.pack_start(self.following_checkbutton,False,False,0)
 		#how about a 'direct' button?
 		self.direct_button = DentButton('direct')
 		self.direct_button.connect('clicked',self.direct_clicked)
-		widgetbox.pack_start(self.direct_button,False,False,0)
+		self.widgetbox.pack_start(self.direct_button,False,False,0)
 		#create stuff for blocking -- commented out 9.3.10 x1101
 		blockbox=gtk.HBox()
 		#enabler
 		self.enable_block_checkbutton = gtk.CheckButton(_("Enable Blocking"))
 		self.enable_block_checkbutton.connect('toggled', self.block_enable_toggled)
-
+		
 		#the blocking buttons
 		self.block_button = DentButton('block')
 		self.block_button.connect('clicked',self.block_clicked)
 		self.block_button.set_sensitive(False)
 		blockbox.pack_start(self.block_button,False,False,0)
 		blockbox.pack_start(self.enable_block_checkbutton,False,False,0)
-		
-		widgetbox.pack_end(blockbox)
+		self.widgetbox.pack_start(blockbox,False,False,0)
+		
+		#the collapse button
+		collapsebox = gtk.Alignment(xalign=1.0)
+		self.collapse_button = DentButton(u'\u25b2')
+		self.collapse_button.connect('clicked',self.collapse_clicked)
+		collapsebox.add(self.collapse_button)
+		self.widgetbox.pack_end(collapsebox,True,True,0)
+		
+		#the collapsed widget box and name label
+		self.widgetbox_collapsed = gtk.HBox(False)
+		self.name_label_collapsed = gtk.Label()
+		self.widgetbox_collapsed.pack_start(self.name_label_collapsed,False,False,0)
+		#its expand button
+		expandbox = gtk.Alignment(xalign=1.0)
+		self.expand_button = DentButton(u'\u25bc')
+		self.expand_button.connect('clicked',self.expand_clicked)
+		expandbox.add(self.expand_button)
+		self.widgetbox_collapsed.pack_end(expandbox,True,True,0)
+		#pack it up
+		self.pack_start(self.widgetbox_collapsed,False,False,0)
+		
 		#create a user dent scroller and add it to the user page
 		self.dentScroller = DentScroller()
 		self.pack_start(self.dentScroller)
 		
-		#make a "close" button
-		hbox = gtk.HBox(False)
-		user_close_button=gtk.Button(_("Close"))
-		hbox.pack_start(user_close_button,False,False,0)
-		user_close_button.connect('clicked',self.close)
-		self.pack_end(hbox,False,False,0)
-	
 	def set_image(self,image):
 		self.image.set_from_file(image)
 		self.image.show()
@@ -110,6 +123,7 @@
 		self.screen_name = data['screen_name']
 		self.user_id=data['id']
 		self.name_label.set_text("%s (%s)" %(data['name'],data['screen_name']) )
+		self.name_label_collapsed.set_text("%s (%s)" %(data['name'],data['screen_name']) )
 		if data['location']!=None:
 			self.location_label.set_text("%s: %s" % (_("Location"),data['location']) )
 			self.location_label.show()
@@ -177,6 +191,16 @@
 		#disable the button
 		widget.set_sensitive(False)
 		self.emit('block-create',self.user_id)
+
+	def collapse_clicked(self,widget):
+		self.userhbox.hide()
+		self.widgetbox.hide()
+		self.widgetbox_collapsed.show()
+	
+	def expand_clicked(self,widget):
+		self.userhbox.show()
+		self.widgetbox.show()
+		self.widgetbox_collapsed.hide()
 	
 	def process_link(self, label, uri ):
 		self.emit('open-link', uri )

=== modified file 'heybuddy.py'
--- heybuddy.py	2011-05-04 21:57:08 +0000
+++ heybuddy.py	2011-05-05 04:39:25 +0000
@@ -192,21 +192,59 @@
 		#self.mainwindow.connect('window-state-event', self.mainwindow_state_event)
 		self.mainwindow.connect('delete-event', self.mainwindow_delete_event)
 		
+		# local function to create a closeable tab label for closeable tabs
+		def closeable_tab_label(caption, tab):
+			tablabel = gtk.HBox(False)
+			tablabel.pack_start(gtk.Label(caption),True,True,0)
+			closebutton = gtk.Button()
+			closeicon = gtk.Image()
+			closeicon.set_from_stock(gtk.STOCK_CLOSE,gtk.ICON_SIZE_MENU)
+			closebutton.set_image(closeicon)
+			closebutton.set_relief(gtk.RELIEF_NONE)
+			tinybutton_style = gtk.RcStyle()
+			tinybutton_style.xthickness = 0
+			tinybutton_style.ythickness = 0
+			closebutton.modify_style(tinybutton_style)
+			if tab != None:  # if this isn't a mock-add
+				closebutton.connect('clicked',tab.close)
+			closebutton.set_tooltip_text(_("Close"))
+			tablabel.pack_start(closebutton,False,False,0)
+			tablabel.show_all()
+			return tablabel
+
+		# do a mock add of dentspage, with a close label, so as to determine height needed for uncloseable tabs' labels, then break it all down again
+		# this is ridiculously hacky, but it works, and doesn't leave anything behind
+		self.dentspage = ScrollPage()
+		self.mock_label = closeable_tab_label(_("Dents"),None)
+		self.mainwindow.notebook.append_page(self.dentspage,self.mock_label)
+		self.mainwindow.show_all() # we have to do this so the tab gets actualised, and thus gets a height
+		min_tab_height = self.mock_label.allocation.height
+		self.mainwindow.hide_all()
+		self.mainwindow.notebook.remove_page(-1)
+		del self.mock_label
+		
+		# local function to create a label the same height as the closeable tabs' labels
+		def uncloseable_tab_label(caption):
+			tablabel = gtk.Label(caption)
+			tablabel.set_size_request(-1,min_tab_height)
+			tablabel.show()
+			return tablabel
+		
 		# create and add all of the pages
 		self.dentspage = ScrollPage()
-		self.mainwindow.notebook.append_page(self.dentspage,gtk.Label(_("Dents") ) )
+		self.mainwindow.notebook.append_page(self.dentspage,uncloseable_tab_label(_("Dents") ) )
 		
 		self.mentionspage = ScrollPage()
-		self.mainwindow.notebook.append_page(self.mentionspage,gtk.Label(_("Mentions")) )
+		self.mainwindow.notebook.append_page(self.mentionspage,uncloseable_tab_label(_("Mentions")) )
 		
 		self.directspage = ScrollPage()
-		self.mainwindow.notebook.append_page(self.directspage,gtk.Label(_("Directs")) )
+		self.mainwindow.notebook.append_page(self.directspage,uncloseable_tab_label(_("Directs")) )
 		
 		#make the conversation page
 		self.contextpage=ContextPage()
 		self.contextpage.connect('context-page-hide',self.hide_contextpage)
 		#add the contextpage
-		self.mainwindow.notebook.append_page(self.contextpage,gtk.Label("Context") )
+		self.mainwindow.notebook.append_page(self.contextpage,closeable_tab_label("Context",self.contextpage))
 		
 		#create a user page
 		self.userpage=UserPage()
@@ -218,15 +256,16 @@
 		self.userpage.connect('block-destroy',self.block_destroy)
 		
 		#add the userpage
-		self.mainwindow.notebook.append_page(self.userpage,gtk.Label(_("User") ) )
+		self.mainwindow.notebook.append_page(self.userpage,closeable_tab_label(_("User"),self.userpage ) )
 		
 		#create a Group page
 		self.grouppage=GroupPage()
 		self.grouppage.connect('group-page-hide',self.hide_grouppage)
 		self.grouppage.connect('join-group',self.join_group)
 		self.grouppage.connect('open-link',self.open_link)
+
 		#add the Grouppage
-		self.mainwindow.notebook.append_page(self.grouppage,gtk.Label(_("Group") ) )
+		self.mainwindow.notebook.append_page(self.grouppage,closeable_tab_label(_("Group"),self.grouppage ) )
 		
 		#create and add the account page
 		self.settingspage = SettingsPage(has_hildon,has_pynotify)
@@ -264,11 +303,11 @@
 		self.settingspage.connect('add-user-filter', self.add_user_filter )
 		self.settingspage.connect('remove-user-filter', self.remove_user_filter )
 		#add the settings to the mainwindow
-		self.mainwindow.add_notebook_page(self.settingspage,gtk.Label(_("Settings") ) )
+		self.mainwindow.add_notebook_page(self.settingspage,uncloseable_tab_label(_("Settings") ) )
 		#create and add the about page
 		about = About(version,branch,self.standard_icon_path,self.readme_file)
 		about.connect('open-link',self.open_link)
-		self.mainwindow.add_notebook_page( about, gtk.Label(_("About") ) )
+		self.mainwindow.add_notebook_page( about, uncloseable_tab_label(_("About") ) )
 		self.mainwindow.show_some()
 		#hide some stuff
 		self.grouppage.hide_all()
@@ -693,6 +732,8 @@
 		self.userpage.disable()
 		#show the page 
 		self.userpage.show_all()
+		#rehide its collapsed widgetbox, that doesn't need to be visible yet
+		self.userpage.widgetbox_collapsed.hide()
 		#clear the userpage stuff
 		self.userpage.clear()
 		#change to the user page
@@ -706,6 +747,8 @@
 		self.userpage.disable()
 		#show the page 
 		self.userpage.show_all()
+		#rehide its collapsed widgetbox, that doesn't need to be visible yet
+		self.userpage.widgetbox_collapsed.hide()
 		#clear the userpage stuff
 		self.userpage.clear()
 		#change to the user page
@@ -959,6 +1002,8 @@
 		self.grouppage.joined_checkbutton.set_sensitive(False)
 		#make the grouppage visible
 		self.grouppage.show_all()
+		#rehide its collapsed widgetbox, that doesn't need to be visible yet
+		self.grouppage.widgetbox_collapsed.hide()
 		#clear the grouppage
 		self.grouppage.clear()
 		#switch to the group page