diff --git a/conf/settings/basic.xml b/conf/settings/basic.xml index d3b1100d24..55121259c0 100644 --- a/conf/settings/basic.xml +++ b/conf/settings/basic.xml @@ -8,8 +8,12 @@ - - + + + + + + diff --git a/conf/settings/settings.dtd b/conf/settings/settings.dtd index e4d350d809..d5b8bd1034 100644 --- a/conf/settings/settings.dtd +++ b/conf/settings/settings.dtd @@ -14,7 +14,8 @@ - + + + + + diff --git a/sw/ground_segment/cockpit/pages.ml b/sw/ground_segment/cockpit/pages.ml index e077ddb80f..3aa6735b8c 100644 --- a/sw/ground_segment/cockpit/pages.ml +++ b/sw/ground_segment/cockpit/pages.ml @@ -44,7 +44,7 @@ class alert (widget: GBin.frame) = method add text = if text <> last then begin let l = Unix.localtime (Unix.gettimeofday ()) in - view#buffer#insert (sprintf "%2d:%2d:%2d " l.Unix.tm_hour l.Unix.tm_min l.Unix.tm_sec); + view#buffer#insert (sprintf "%02d:%02d:%02d " l.Unix.tm_hour l.Unix.tm_min l.Unix.tm_sec); view#buffer#insert text; view#buffer#insert "\n"; last <- text @@ -234,16 +234,14 @@ let one_setting = fun i do_change packing s (tooltips:GData.tooltips) strip -> | Some v -> do_change i v in ignore (undo_but#connect#clicked ~callback); tooltips#set_tip undo_but#coerce ~text:"Undo"; - begin - try - let label = ExtXml.attrib s "strip_button" - and sp_value = f "button_value" in - let b = GButton.button ~label () in - Strip.add_widget strip b#coerce; - ignore (b#connect#clicked (fun _ -> do_change i sp_value)) - with - ExtXml.Error _ -> () - end; + List.iter (fun x -> + assert(ExtXml.tag_is x "strip_button"); + let label = ExtXml.attrib x "name" + and sp_value = ExtXml.float_attrib x "value" in + let b = GButton.button ~label () in + Strip.add_widget strip b#coerce; + ignore (b#connect#clicked (fun _ -> do_change i sp_value))) + (Xml.children s); _v diff --git a/sw/tools/gen_settings.ml b/sw/tools/gen_settings.ml index 12d8050659..c9a9b0cea0 100644 --- a/sw/tools/gen_settings.ml +++ b/sw/tools/gen_settings.ml @@ -164,3 +164,4 @@ let _ = with Xml.Error e -> prerr_endline (Xml.error e) | Dtd.Prove_error e -> prerr_endline (Dtd.prove_error e); exit 1 + | Dtd.Parse_error e -> prerr_endline (Dtd.parse_error e); exit 1