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

[quinn at server.beryl-project.org]

Author: quinn
Date: 2007-01-01 08:59:17 +0000 (Mon, 01 Jan 2007)
New Revision: 2201

Modified:
   trunk/beryl-settings-2/main.py
Log:
still doesn't do anything, but at least shows more setting entries


Modified: trunk/beryl-settings-2/main.py
===================================================================
--- trunk/beryl-settings-2/main.py	2007-01-01 08:01:26 UTC (rev 2200)
+++ trunk/beryl-settings-2/main.py	2007-01-01 08:59:17 UTC (rev 2201)
@@ -71,6 +71,74 @@
 	pl[10].add(plgInfo[7])
 	pl[10].show_all()
 
+
+AllSettings=[]
+
+def MakeAndConnect(wid,setting):
+	global AllSettings
+	resbut=gtk.Button()
+	resbut.props.image=gtk.image_new_from_stock(gtk.STOCK_CLEAR,gtk.ICON_SIZE_BUTTON)
+	SetWid=()
+	if (setting.Type == 'Bool'):
+		foo=gtk.HBox(False,8)
+		foo.props.border_width=4
+		foo.pack_start(resbut,False,False)
+		bar=gtk.CheckButton(setting.ShortDesc)
+		foo.pack_start(bar,True,True)
+		bar.props.xalign=0
+		SetWid=(bar)
+	elif (setting.Type == 'String'):
+		foo=gtk.HBox(False,8)
+		foo.props.border_width=4
+		foo.pack_start(resbut,False,False)
+		foo.pack_start(gtk.Label(setting.ShortDesc),False,False)
+		if (len(setting.Restrictions)):
+			bar=gtk.combo_box_new_text()
+			for m in setting.Restrictions:
+				bar.append_text(m)
+		else:
+			bar=gtk.Entry()
+			bar.props.width_chars=40
+		foo.pack_end(bar,False,False)
+		SetWid=(bar)
+	elif (setting.Type == 'Int' or setting.Type=='Float'):
+		foo=gtk.Frame(setting.ShortDesc)
+		baz=gtk.HBox(False,8)
+		baz.props.border_width=4
+		baz.pack_start(resbut,False,False)
+		foo.add(baz)
+		#print setting.Restrictions
+		if (len(setting.Restrictions)>2):
+			Adj=gtk.Adjustment(setting.Value,setting.Restrictions[0],setting.Restrictions[1],setting.Restrictions[2],setting.Restrictions[2],
+					setting.Restrictions[2])
+		else:
+			Adj=gtk.Adjustment(setting.Value,setting.Restrictions[0],setting.Restrictions[1],1,1,1)
+		bar=gtk.HScale(Adj)
+		bar.props.draw_value=False
+		bar.props.update_policy=gtk.UPDATE_DELAYED
+		if (len(setting.Restrictions)>2):
+			bar.props.digits=4
+			bat=gtk.SpinButton(Adj,setting.Restrictions[2],4)
+		else:
+			bar.props.digits=0
+			bat=gtk.SpinButton(Adj,1,1)
+		baz.pack_start(bar,True,True)
+		baz.pack_start(bat,False,False)
+		SetWid=(bar)#,bat)
+	elif (setting.Type == 'Color'):
+		foo=gtk.HBox()
+		foo.pack_start(resbut,False,False)
+		foo.pack_start(gtk.Label(setting.ShortDesc),False,False)
+		bar=gtk.ColorButton()
+		foo.pack_end(bar,False,False)
+		SetWid=(bar)
+	else:
+		print setting.Type
+		return
+	wid.pack_start(foo,False,False)
+	SetData=(setting,SetWid)
+	AllSettings=AllSettings+[SetData]
+
 MainWindow=gtk.Window()
 MainChild=gtk.VBox()
 MainWindow.add(MainChild)
@@ -189,7 +257,7 @@
 			PlugLabel=gtk.Label()
 			PlugLabel.set_markup("<small>%s</small>"%(Plug.ShortDesc))
 			PlugChunk.pack_start(PlugLabel,False,False)
-			PlugHolder.pack_start(PlugChunkEvBox)
+			PlugHolder.pack_start(PlugChunkEvBox,False,False)
 			SubBox=gtk.VBox(False,8)
 			PlugHeaderBox=gtk.HBox()
 			PlugHeaderImage=gtk.Image()
@@ -206,7 +274,7 @@
 			NoteBook.props.scrollable=True
 			SubBox.pack_start(NoteBook,True,True)
 			for c in Plug.Groups:
-				gvb=gtk.VBox()
+				gvb=gtk.VBox(False,4)
 				NoteBook.append_page(gvb,gtk.Label(c.Name))
 				for j in c.SubGroups:
 					ommm=gvb
@@ -219,20 +287,19 @@
 						gvb.pack_start(mmm,False,False)
 					for s in j.Settings:
 						if (not s.Advanced):
-							mm=gtk.Label(s.ShortDesc)
-							mm.props.xalign=0
-							ommm.pack_start(mm,False,False)
+							MakeAndConnect(ommm,s)
 					vppp=gtk.Frame()
 					emmm=gtk.Expander("Advanced")
 					vppp.add(emmm)
-					ommm.pack_start(vppp,False,False)
-					ommm=gtk.VBox()
-					emmm.add(ommm)
+					xmmm=gtk.VBox()
+					emmm.add(xmmm)
+					fo=False
 					for s in j.Settings:
 						if (s.Advanced):
-							mm=gtk.Label(s.ShortDesc)
-							mm.props.xalign=0
-							ommm.pack_start(mm,False,False)
+							MakeAndConnect(xmmm,s)
+							fo=True
+					if fo:
+						ommm.pack_start(vppp,False,False)
 			#NoteBook.append_page(gtk.VBox(),gtk.Label("Blank Page"))
 			PlugInfo=(PlugBasePixbuf,PlugHighPixbuf,PlugImage,PlugLabel,Plug,len(CatPlugs),len(AllCats),SubBox,PlugEnableButton)
 			CatPlugs=CatPlugs+[PlugInfo]