From 472f1dff74e63e2cb0dcb125edb5208f65cfeea7 Mon Sep 17 00:00:00 2001
From: lizhi-rocky <zli@linx-info.com>
Date: Thu, 15 Jul 2010 17:35:13 +0800
Subject: [PATCH] add scroll processing

---
 xml/interface_ng.xml | 44 ++++++++++++++++++++++++++++----------------
 xml/interface_t.xml  | 21 ++++++++++++++-------
 2 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/xml/interface_ng.xml b/xml/interface_ng.xml
index 404f1bb..3ec224a 100644
--- a/xml/interface_ng.xml
+++ b/xml/interface_ng.xml
@@ -29,22 +29,20 @@
       <optional>
 	<ref name="widget_attribute"/>
       </optional>
-      <interleave>
-	<optional>
-	  <!-- geometry management is to manage its sons -->
-	  <ref name="geometry_management"/>
-	</optional>
-	<optional>
-	  <!-- geometry location is the location inside its parent -->
-	  <ref name="geometry_location"/>
-	</optional>
-	<optional>
-	  <ref name="variable"/>
-	</optional>
-	<optional>
-	  <ref name="action"/>
-	</optional>
-      </interleave>
+      <optional>
+	<!-- geometry management is to manage its sons -->
+	<ref name="geometry_management"/>
+      </optional>
+      <optional>
+	<!-- geometry location is the location inside its parent -->
+	<ref name="geometry_location"/>
+      </optional>
+      <optional>
+	<ref name="variable"/>
+      </optional>
+      <optional>
+	<ref name="action"/>
+      </optional>
       <zeroOrMore>
 	<ref name="widget"/>
       </zeroOrMore>
@@ -82,6 +80,14 @@ on special cases -->
 	<optional>
 	  <attribute name="textvariable"/>
 	</optional>
+	<optional>
+	  <attribute name="orient">
+	    <choice>
+	      <value>vertical</value>
+	      <value>horizontal</value>
+	    </choice>
+	  </attribute>
+	</optional>
       </interleave>
     </element>
   </define>
@@ -150,6 +156,12 @@ on special cases -->
       <optional>
 	<attribute name="quit"/>
       </optional>
+      <zeroOrMore>
+	<element name='scroll'>
+	  <attribute name='scrolling'/>
+	  <attribute name='scrolled'/>
+	</element>
+      </zeroOrMore>
     </element>
   </define>
 
diff --git a/xml/interface_t.xml b/xml/interface_t.xml
index 0db25c4..9176188 100644
--- a/xml/interface_t.xml
+++ b/xml/interface_t.xml
@@ -111,9 +111,9 @@ row 4 |                                                            |
 	<grid_location row='0' column='0' sticky='W'/>
       </widget>
       <widget type='Entry'>
-	<action init='serial_no_init' quit='serial_no_quit'/>
 	<widget_attribute width='12' textvariable='serial_no.number'/>
 	<grid_location row='1' column='0'/>
+	<action init='serial_no_init' quit='serial_no_quit'/>
       </widget>
     </widget>
   </widget>
@@ -159,21 +159,28 @@ row 4 |                                                            |
 	<widget_attribute text='device:'/>
 	<grid_location row='0' column='0' />
       </widget>
-      <widget type='Entry'>
-	<widget_attribute width='10'/>
+      <widget type='Listbox'>
+	<widget_attribute width='20' height='10'/>
 	<grid_location row='0' column='1' padx='10'/>
       </widget>
     </widget>
 	
     <widget type='Frame'>
-      <grid_management rows='2' columns='4'>
+      <grid_management rows='2' columns='5'>
 	<configure column='3' weight='1'/>
       </grid_management>
       <grid_location row='1' column='1' sticky='NW'/>
+      <action>
+	<scroll scrolling='partition.scroll' scrolled='partition.list'/>
+      </action>
+      <widget type='Listbox' name='partition.list'>
+	<widget_attribute width='60'/>
+	<grid_location row='0' column='0' columnspan='4' sticky='NWS' pady='10'/>
+      </widget>
 
-      <widget type='Listbox'>
-	<widget_attribute width='60' height='15'/>
-	<grid_location row='0' column='0' columnspan='4' sticky='W' pady='10'/>
+      <widget type='Scrollbar' name='partition.scroll'>
+	<widget_attribute orient='vertical'/>
+	<grid_location row='0' column='4' sticky='NS' pady='10'/>
       </widget>
 
       <widget type='Button'>