Property EscapeStore addede to ValueInput

wb/mmi/wb/src/wb_wiz_directoryvolume_1.pwg

@@ -3,20 +3,20 @@
 135 20
 101 20
 102 7
-103 128
-104 7.1048
-136 7.1048
+103 77
+104 4.90797
+136 4.90797
 105 100
-106 2
-107 27
+106 1
+107 18
 108 28.2639
 109 2.7
 110 25.0688
 111 3.84998
 116 0
-117 18
-118 200
-119 174
+117 0
+118 166
+119 160
 120 0
 121 Claes context
 122 0
@@ -483,6 +483,7 @@ pwr_exe:
 2805 0.2
 2806 0
 99
+2901 2
 99
 99
 302 0
@@ -734,6 +735,7 @@ pwr_exe:
 2805 -0.55
 2806 0
 99
+2901 2
 99
 99
 302 0
@@ -1222,6 +1224,7 @@ pwr_exe:
 1306 0
 1307 
 1308 
+1309 1
 99
 66
 6600 9
@@ -1396,6 +1399,7 @@ pwr_exe:
 1306 0
 1307 
 1308 
+1309 1
 99
 66
 6600 0
@@ -1570,6 +1574,7 @@ pwr_exe:
 1306 0
 1307 
 1308 
+1309 1
 99
 66
 6600 0
@@ -1744,6 +1749,7 @@ pwr_exe:
 1306 0
 1307 
 1308 
+1309 1
 99
 66
 6600 0

wb/mmi/wb/src/wb_wiz_directoryvolume_4.pwg

@@ -2,22 +2,22 @@
 100 20
 135 20
 101 20
-102 43
-103 418
-104 6.50407
-136 6.50407
+102 -45
+103 -21
+104 3.54227
+136 3.54227
 105 100
-106 13
-107 1
+106 -7
+107 -3
 108 30.9
 109 2.95
 110 44.1188
 111 0.25
 116 0
-117 134
-118 200
-119 284
-120 0
+117 0
+118 118
+119 114
+120 1
 121 Claes context
 122 0
 126 1
@@ -483,6 +483,7 @@ pwr_exe:
 2805 0.2
 2806 0
 99
+2901 2
 99
 99
 302 0
@@ -596,6 +597,7 @@ pwr_exe:
 2805 -0.55
 2806 0
 99
+2901 2
 99
 99
 302 0
@@ -847,6 +849,7 @@ pwr_exe:
 2805 -0.55
 2806 0
 99
+2901 2
 99
 99
 302 0
@@ -1192,6 +1195,7 @@ pwr_exe:
 2805 -0.771778
 2806 0
 99
+2901 2
 99
 99
 302 0
@@ -1774,6 +1778,7 @@ pwr_exe:
 1306 0
 1307 
 1308 
+1309 1
 99
 66
 6600 9
@@ -1980,6 +1985,7 @@ pwr_exe:
 1306 0
 1307 
 1308 
+1309 1
 99
 66
 6600 0
@@ -8142,6 +8148,7 @@ pwr_exe:
 1306 0
 1307 
 1308 
+1309 1
 99
 66
 6600 0

xtt/lib/ge/src/ge_dyn.cpp

 /* 
- * Proview   $Id: ge_dyn.cpp,v 1.47 2007-01-04 08:18:35 claes Exp $
+ * Proview   $Id: ge_dyn.cpp,v 1.48 2007-01-17 06:20:38 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -3525,6 +3525,11 @@ void GeValueInput::get_attributes( attr_sItem *attrinfo, int *item_count)
   attrinfo[i].type = glow_eType_Boolean;
   attrinfo[i++].size = sizeof( unselect);
 
+  strcpy( attrinfo[i].name, "ValueInput.EscapeStore");
+  attrinfo[i].value = &escape_store;
+  attrinfo[i].type = glow_eType_Boolean;
+  attrinfo[i++].size = sizeof( escape_store);
+
   strcpy( attrinfo[i].name, "ValueInput.MinValueAttr");
   attrinfo[i].value = minvalue_attr;
   attrinfo[i].type = glow_eType_String;
@@ -3555,6 +3560,7 @@ void GeValueInput::save( ofstream& fp)
   fp << int(ge_eSave_ValueInput_unselect) << FSPACE << unselect << endl;
   fp << int(ge_eSave_ValueInput_minvalue_attr) << FSPACE << minvalue_attr << endl;
   fp << int(ge_eSave_ValueInput_maxvalue_attr) << FSPACE << maxvalue_attr << endl;
+  fp << int(ge_eSave_ValueInput_escape_store) << FSPACE << escape_store << endl;
   fp << int(ge_eSave_End) << endl;
 }
 
@@ -3582,6 +3588,7 @@ void GeValueInput::open( ifstream& fp)
         fp.get();
         fp.getline( maxvalue_attr, sizeof(maxvalue_attr));
         break;
+      case ge_eSave_ValueInput_escape_store: fp >> escape_store; break;
       case ge_eSave_End: end_found = 1; break;
       default:
         cout << "GeValueInput:open syntax error" << endl;
@@ -3669,8 +3676,17 @@ int GeValueInput::action( grow_tObject object, glow_tEvent event)
     break;
   }
   case glow_eEvent_InputFocusLost: {
+
+    if ( escape_store) {
+      pwr_tStatus sts;
+      char str[200];
+
+      grow_GetAnnotation( object, 1, str, sizeof(str));
+      sts = change_value( object, str);
+    }
     grow_CloseAnnotationInput( object, 1);
     value_element->first_scan = 1;
+
     break;
   }
   default: ;    

xtt/lib/ge/src/ge_dyn.h

 /* 
- * Proview   $Id: ge_dyn.h,v 1.30 2007-01-04 08:18:35 claes Exp $
+ * Proview   $Id: ge_dyn.h,v 1.31 2007-01-17 06:20:38 claes Exp $
  * Copyright (C) 2005 SSAB Oxelsund AB.
  *
  * This program is free software; you can redistribute it and/or 
@@ -324,6 +324,7 @@
     ge_eSave_ValueInput_unselect      	= 1306,
     ge_eSave_ValueInput_minvalue_attr   = 1307,
     ge_eSave_ValueInput_maxvalue_attr   = 1308,
+    ge_eSave_ValueInput_escape_store    = 1309,
     ge_eSave_Rotate_attribute		= 1400,
     ge_eSave_Rotate_x0			= 1401,
     ge_eSave_Rotate_y0			= 1402,
@@ -1138,6 +1139,7 @@ class GeValueInput : public GeDynElem {
   int clear;			//!< Clear input field it is when opened.
   int popup;			//!< Input in popup dialog.
   int unselect;			//!< Text not selected in input field when opened.
+  int escape_store;	       	//!< Store value when focus is lost.
   pwr_tAName minvalue_attr;
   pwr_tAName maxvalue_attr;
 	
@@ -1148,11 +1150,12 @@ class GeValueInput : public GeDynElem {
   GeValueInput( GeDyn *e_dyn) : 
     GeDynElem(e_dyn, (ge_mDynType) 0, ge_mActionType_ValueInput, 
 	      ge_eDynPrio_ValueInput),
-    min_value(0), max_value(0), clear(0), popup(0), unselect(0), value_element(0)
+    min_value(0), max_value(0), clear(0), popup(0), unselect(0), escape_store(0), value_element(0)
     { strcpy( minvalue_attr, ""); strcpy( maxvalue_attr, "");}
   GeValueInput( const GeValueInput& x) :
     GeDynElem(x.dyn,x.dyn_type,x.action_type,x.prio), min_value(x.min_value),
-    max_value(x.max_value), clear(x.clear), popup(x.popup), unselect(x.unselect)
+    max_value(x.max_value), clear(x.clear), popup(x.popup), unselect(x.unselect), 
+    escape_store(x.escape_store)
     { strcpy( minvalue_attr, x.minvalue_attr); strcpy( maxvalue_attr, x.maxvalue_attr);}
   void get_attributes( attr_sItem *attrinfo, int *item_count);
   void save( ofstream& fp);