h-client:added a notebook widget to better display the entries

1 files changed, 35 insertions, 22 deletions

diff --git a/h-client/hclient.py b/h-client/hclient.py
index be83717..378f776 100644
--- a/h-client/hclient.py
+++ b/h-client/hclient.py
@@ -810,8 +810,21 @@ class hclient:
 
 		#create the entries
 
-		self.rightTable = gtk.Table(8, 2, False)
+		notebook = gtk.Notebook()
+		notebook.set_tab_pos(gtk.POS_TOP)
+		notebook.show()
+		label_base = gtk.Label("Base")
+		label_adv = gtk.Label("Advanced")
 
+		self.rightTable = gtk.Table(4, 2, False)
+		self.rightTableAdvances = gtk.Table(6, 2, False)
+
+		self.rightTable.set_border_width(5)
+		self.rightTableAdvances.set_border_width(5)
+		
+		notebook.append_page(self.rightTable, label_base)
+		notebook.append_page(self.rightTableAdvances, label_adv)
+		
 		### model
 		#model name label
 		self.modelNameLabel = gtk.Label("Model name:")
@@ -856,14 +869,14 @@ class hclient:
 		self.vendorIdProductIdLabel = gtk.Label("VendorID:productID code:")
 		self.vendorIdProductIdLabel.set_alignment(0.88,0.5)
 		#add the label
-		self.rightTable.attach(self.vendorIdProductIdLabel, 0, 1, 2, 3)
+		self.rightTableAdvances.attach(self.vendorIdProductIdLabel, 0, 1, 0, 1)
 
 		#vendorid:productid input
 		self.vendorIdProductIdEntry = gtk.Entry()
 		#set as not editable
 		self.vendorIdProductIdEntry.set_editable(False)
 		#add the input to the table
-		self.rightTable.attach(self.vendorIdProductIdEntry, 1, 2, 2, 3)
+		self.rightTableAdvances.attach(self.vendorIdProductIdEntry, 1, 2, 0, 1)
 
 
 		###subtype
@@ -871,12 +884,12 @@ class hclient:
 		self.subtypeLabel = gtk.Label("Subtype:")
 		self.subtypeLabel.set_alignment(0.94,0.5)
 		#add the label
-		self.rightTable.attach(self.subtypeLabel, 0, 1, 3, 4)
+		self.rightTableAdvances.attach(self.subtypeLabel, 0, 1, 1, 2)
 
 		#subtype input
 		self.subtypeCombo = gtk.combo_box_new_text()
 		#add the input to the table
-		self.rightTable.attach(self.subtypeCombo, 1, 2, 3, 4)
+		self.rightTableAdvances.attach(self.subtypeCombo, 1, 2, 1, 2)
 
 		
 		###year of commercialization
@@ -884,12 +897,12 @@ class hclient:
 		self.commYearLabel = gtk.Label("Year of commercialization:")
 		self.commYearLabel.set_alignment(0.87,0.5)
 		#add the label
-		self.rightTable.attach(self.commYearLabel, 0, 1, 4, 5)
+		self.rightTableAdvances.attach(self.commYearLabel, 0, 1, 2, 3)
 
 		self.commYearCombo = gtk.combo_box_new_text()
 
 		#add the combo to the table
-		self.rightTable.attach(self.commYearCombo, 1, 2, 4, 5)
+		self.rightTableAdvances.attach(self.commYearCombo, 1, 2, 2, 3)
 
 
 		###interface
@@ -897,7 +910,7 @@ class hclient:
 		self.interfaceLabel = gtk.Label("Interface:")
 		self.interfaceLabel.set_alignment(0.94,0.5)
 		#add the label
-		self.rightTable.attach(self.interfaceLabel, 0, 1, 5, 6)
+		self.rightTableAdvances.attach(self.interfaceLabel, 0, 1, 3, 4)
 
 		self.interfaceCombo = gtk.combo_box_new_text()
 
@@ -906,7 +919,7 @@ class hclient:
 		self.interfaceCombo.set_active(0)
 
 		#add the combo to the table
-		self.rightTable.attach(self.interfaceCombo, 1, 2, 5, 6)
+		self.rightTableAdvances.attach(self.interfaceCombo, 1, 2, 3, 4)
 
 
 		### distribution
@@ -914,7 +927,7 @@ class hclient:
 		self.distributionLabel = gtk.Label("Distribution used: ")
 		self.distributionLabel.set_alignment(0.95,0.5)
 		#add the label
-		self.rightTable.attach(self.distributionLabel, 0, 1, 6, 7)
+		self.rightTable.attach(self.distributionLabel, 0, 1, 2, 3)
 
 		#distribution input
 		self.distributionEntry = gtk.Entry()
@@ -922,7 +935,7 @@ class hclient:
 		
 		
 		#add the input
-		self.rightTable.attach(self.distributionEntry, 1, 2, 6, 7)
+		self.rightTable.attach(self.distributionEntry, 1, 2, 2, 3)
 
 
 		### kernel
@@ -930,12 +943,12 @@ class hclient:
 		self.kernelLabel = gtk.Label("Kernel libre version:")
 		self.kernelLabel.set_alignment(0.92,0.5)
 		#add the label
-		self.rightTable.attach(self.kernelLabel, 0, 1, 7, 8)
+		self.rightTableAdvances.attach(self.kernelLabel, 0, 1, 4, 5)
 
 		#kernel input
 		self.kernelEntry = gtk.Entry()
 		#add the input
-		self.rightTable.attach(self.kernelEntry, 1, 2, 7, 8)
+		self.rightTableAdvances.attach(self.kernelEntry, 1, 2, 4, 5)
 
 
 		###how it works
@@ -943,12 +956,12 @@ class hclient:
 		self.howItWorksLabel = gtk.Label("Does it work?")
 		self.howItWorksLabel.set_alignment(0.95,0.5)
 		#add the label
-		self.rightTable.attach(self.howItWorksLabel, 0, 1, 8, 9)
+		self.rightTable.attach(self.howItWorksLabel, 0, 1, 3, 4)
 
 		self.howItWorksCombo = gtk.combo_box_new_text()
 
 		#add the combo to the table
-		self.rightTable.attach(self.howItWorksCombo, 1, 2, 8, 9)
+		self.rightTable.attach(self.howItWorksCombo, 1, 2, 3, 4)
 		
 
 		### driver
@@ -956,12 +969,12 @@ class hclient:
 		self.driverLabel = gtk.Label("Free driver used:")
 		self.driverLabel.set_alignment(0.94,0.5)
 		#add the label
-		self.rightTable.attach(self.driverLabel, 0, 1, 9, 10)
+		self.rightTableAdvances.attach(self.driverLabel, 0, 1, 5, 6)
 
 		#driver input
 		self.driverEntry = gtk.Entry()
 		#add the input
-		self.rightTable.attach(self.driverEntry, 1, 2, 9, 10)
+		self.rightTableAdvances.attach(self.driverEntry, 1, 2, 5, 6)
 
 		
 		### description
@@ -1018,7 +1031,7 @@ class hclient:
 		self.rightWindow = gtk.VBox(False, 0)
 
 		self.rightWindow.pack_start(self.tihbox, True, True, 3)
-		self.rightWindow.pack_start(self.rightTable, False, True, 3)
+		self.rightWindow.pack_start(notebook, False, True, 3)
 		self.rightWindow.pack_start(self.descriptionLabel, False, True, 3)
 		self.rightWindow.pack_start(sw, False, True, 0)
 		self.rightWindow.pack_start(hboxBelowEntries, False, True, 10)
@@ -1026,14 +1039,14 @@ class hclient:
 
 		rhbox = gtk.HBox(False, 0)
 		rhbox.pack_start(self.rightWindow, True, True, 5)
-		rFrame = gtk.Frame()
-		rFrame.add(rhbox)
-		rFrame.set_border_width(5)
+		#rFrame = gtk.Frame()
+		#rFrame.add(rhbox)
+		#rFrame.set_border_width(5)
 
 		rvbox = gtk.VBox(False, 0)
 		
 		rvbox.pack_start(rthbox, True, True, 0)
-		rvbox.pack_start(rFrame, True, True, 0)
+		rvbox.pack_start(rhbox, True, True, 0)
 
 		self.centerWindow.pack_start(rvbox, True, True, 0)