[beryl-commits] r2206 - trunk/beryl-settings-2

[quinn at server.beryl-project.org]

Author: quinn
Date: 2007-01-01 10:26:30 +0000 (Mon, 01 Jan 2007)
New Revision: 2206

Modified:
   trunk/beryl-settings-2/main.py
Log:
some padding and other appearance fixes


Modified: trunk/beryl-settings-2/main.py
===================================================================
--- trunk/beryl-settings-2/main.py	2007-01-01 10:17:27 UTC (rev 2205)
+++ trunk/beryl-settings-2/main.py	2007-01-01 10:26:30 UTC (rev 2206)
@@ -301,6 +301,7 @@
 		SillyHBox=gtk.HBox(False,8)
 		PlugHolderFrame=gtk.Frame()
 		PlugHolder=gtk.VBox()
+		PlugHolder.props.border_width=4
 		PlugHolderFrame.add(PlugHolder)
 		SillyHBox.pack_start(PlugHolderFrame,False,False,0)
 		#SillyVBox.pack_start(SillyHBox,True,True,8)
@@ -357,26 +358,30 @@
 			PlugLabel.set_markup("<small>%s</small>"%(Plug.ShortDesc))
 			PlugChunk.pack_start(PlugLabel,False,False)
 			PlugHolder.pack_start(PlugChunkEvBox,False,False)
-			SubBox=gtk.VBox(False,8)
-			PlugHeaderBox=gtk.HBox()
+			SubBox=gtk.VBox(False,4)
+			SubBox.props.border_width=4
+			PlugHeaderBox=gtk.HBox(False,8)
 			PlugHeaderImage=gtk.Image()
 			PlugHeaderImage.set_from_pixbuf(PlugBasePixbuf)
-			PlugHeaderBox.pack_start(PlugHeaderImage,False,False,8)
+			PlugHeaderBox.pack_start(PlugHeaderImage,False,False,0)
 			PlugHeaderLabel=gtk.Label()
-			PlugHeaderLabel.props.width_request=CategoryStrip.size_request()[0]-PlugHolder.size_request()[0]
+			PlugHeaderLabel.set_markup("<b><big>%s</big></b>\n<i>%s</i>"%(Plug.ShortDesc,Plug.LongDesc))
 			PlugHeaderLabel.props.wrap=True
-			PlugHeaderLabel.set_markup("<b><big>%s</big></b>\n<i>%s</i>"%(Plug.ShortDesc,Plug.LongDesc))
+			if (PlugHeaderLabel.size_request()[0]>400):
+				PlugHeaderLabel.props.width_request=400
 			PlugHeaderLabel.props.xalign=0
-			PlugHeaderBox.pack_start(PlugHeaderLabel,True,True,8)
+			PlugHeaderBox.pack_start(PlugHeaderLabel,True,True,0)
 			SubBox.pack_start(PlugHeaderBox,False,False)
 			NoteBook=gtk.Notebook()
 			NoteBook.props.scrollable=True
 			SubBox.pack_start(NoteBook,True,True)
 			for c in Plug.Groups:
 				gvb=gtk.VBox(False,4)
+				hasany=False
 				NoteBook.append_page(gvb,gtk.Label(c.Name))
 				for j in c.SubGroups:
 					if (j.Name == '__keymouse'):
+						hasany=True
 						gvb.pack_start(MakeBindingsList())
 						continue
 					ommm=gvb
@@ -393,6 +398,7 @@
 						if (not s.Advanced):
 							if (MakeAndConnect(ommm,s)):
 								fo=True
+								hasany=True
 					if (fo and exp):
 						gvb.pack_start(exp,False,False)
 					vppp=gtk.Frame()
@@ -405,8 +411,11 @@
 						if (s.Advanced):
 							if (MakeAndConnect(xmmm,s)):
 								fo=True
+								hasany=True
 					if fo:
 						ommm.pack_start(vppp,False,False)
+				if not hasany:
+					NoteBook.remove_page(-1)
 			#NoteBook.append_page(gtk.VBox(),gtk.Label("Blank Page"))
 			PlugInfo=(PlugBasePixbuf,PlugHighPixbuf,PlugImage,PlugLabel,Plug,len(CatPlugs),len(AllCats),SubBox,PlugEnableButton)
 			CatPlugs=CatPlugs+[PlugInfo]