r6204 - in trunk/gnue-forms: samples/history samples/simple src/uidrivers/gtk2

[johannes]

Author: johannes
Date: 2004-08-25 07:31:15 -0500 (Wed, 25 Aug 2004)
New Revision: 6204

Modified:
   trunk/gnue-forms/samples/history/first.gfd
   trunk/gnue-forms/samples/history/myform.gfd
   trunk/gnue-forms/samples/simple/form.gfd
   trunk/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py
Log:
Errortext is converted to unicode using i18n.encoding


Modified: trunk/gnue-forms/samples/history/first.gfd
===================================================================
--- trunk/gnue-forms/samples/history/first.gfd  2004-08-25 12:30:12 UTC (rev 
6203)
+++ trunk/gnue-forms/samples/history/first.gfd  2004-08-25 12:31:15 UTC (rev 
6204)
@@ -6,8 +6,6 @@
 <form title="The First Ever">
   <options>
     <version/>
-    <height/>
-    <width/>
   </options>
   <logic>
     <block name="test"/>

Modified: trunk/gnue-forms/samples/history/myform.gfd
===================================================================
--- trunk/gnue-forms/samples/history/myform.gfd 2004-08-25 12:30:12 UTC (rev 
6203)
+++ trunk/gnue-forms/samples/history/myform.gfd 2004-08-25 12:31:15 UTC (rev 
6204)
@@ -6,22 +6,24 @@
 <form title="Test Form">
   <options>
     <version/>
-    <height/>
-    <width/>
   </options>
   <logic>
     <block name="style1"/>
     <block name="style2">
       <field name="test1" field="test1" value="Type Here"/>
       <field name="test2" field="test2" value="Type Here Part Two"/>
+      <field name="hint" default="Press Ctrl+Page Up/Down to switch pages"
+        editable="N"/>
     </block>
   </logic>
-  <layout xmlns:c="GNUe:Layout:Char" c:height="12" c:width="40">
-    <page>
+  <layout xmlns:c="GNUe:Layout:Char" c:height="12" c:width="40" tabbed="top">
+    <page name="One">
       <label text="Who told you" c:x="1" c:y="1"/>
       <label text="That you could stop coding?" c:x="1" c:y="2"/>
+      <entry c:x="1" c:y="3" c:width="40" c:height="1" block="style2"
+        field="hint" focusorder="1"/>
     </page>
-    <page>
+    <page name="Two">
       <entry block="style2" field="test1" c:height="1" c:width="30" c:x="1"
              c:y="1"/>
       <entry block="style2" field="test2" c:height="1" c:width="30" c:x="1"

Modified: trunk/gnue-forms/samples/simple/form.gfd
===================================================================
--- trunk/gnue-forms/samples/simple/form.gfd    2004-08-25 12:30:12 UTC (rev 
6203)
+++ trunk/gnue-forms/samples/simple/form.gfd    2004-08-25 12:31:15 UTC (rev 
6204)
@@ -10,6 +10,7 @@
   <logic>
     <block name="coding"/>
     <block name="testing">
+      <field name="foobar" default="Press Ctrl+Page Up/Down" editable="N"/>
       <field name="text1">
         <options>
           <option name="tip" value="This is the tip for the first text box"/>
@@ -22,11 +23,13 @@
       </field>
     </block>
   </logic>
-  <layout xmlns:c="GNUe:Layout:Char" c:height="6" c:width="25">
+
+  <layout xmlns:c="GNUe:Layout:Char" c:height="6" c:width="25" tabbed="top">
     <page name="Page_1">
       <label name="Label_1" text="Simple first page" c:x="1" c:y="1"/>
       <label name="Label_2" text="Only contains labels" c:x="1" c:y="2"/>
-      <label name="Label_3" text="Page Up or Page Down" c:x="1" c:y="3"/>
+      <entry c:x="1" c:y="3" c:width="30" c:height="1" field="foobar"
+        block="testing"/>
     </page>
     <page name="Page_2">
       <label name="Label_4" text="Text Box 1" c:x="1" c:y="1"/>

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py       2004-08-25 
12:30:12 UTC (rev 6203)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UILoginHandler.py       2004-08-25 
12:31:15 UTC (rev 6204)
@@ -96,7 +96,8 @@
     # Add an error text if given
     if error is not None:
       if isinstance (error, types.StringType):
-        error = unicode (error, 'utf-8')
+        print "Error:", error
+        error = unicode (error, i18n.encoding)
       label = gtk.Label (error)
       label.set_line_wrap (True)
       label.modify_fg (gtk.STATE_NORMAL, gtk.gdk.color_parse ('red'))