summaryrefslogtreecommitdiff
path: root/ide/utils
diff options
context:
space:
mode:
Diffstat (limited to 'ide/utils')
-rw-r--r--ide/utils/config_file.ml4
-rw-r--r--ide/utils/configwin_ihm.ml12
-rw-r--r--ide/utils/uoptions.ml32
3 files changed, 22 insertions, 26 deletions
diff --git a/ide/utils/config_file.ml b/ide/utils/config_file.ml
index 30eb0111..d972639f 100644
--- a/ide/utils/config_file.ml
+++ b/ide/utils/config_file.ml
@@ -23,7 +23,7 @@
(* *)
(*********************************************************************************)
-(* $Id: config_file.ml 8618 2006-03-08 11:44:47Z notin $ *)
+(* $Id: config_file.ml 10348 2007-12-06 17:36:14Z aspiwack $ *)
(* TODO *)
(* section comments *)
@@ -552,7 +552,7 @@ class filename_cp = string_cp
(* ******************************************************************************** *)
-(******************** Backward compatibility with module Options ****************** *)
+(******************** Backward compatibility with module Flags.****************** *)
(* ******************************************************************************** *)
type 'a option_class = 'a wrappers
diff --git a/ide/utils/configwin_ihm.ml b/ide/utils/configwin_ihm.ml
index 240fd829..3ab3823d 100644
--- a/ide/utils/configwin_ihm.ml
+++ b/ide/utils/configwin_ihm.ml
@@ -364,7 +364,7 @@ class string_param_box param (tt:GData.tooltips) =
let _ = dbg "string_param_box" in
let hbox = GPack.hbox () in
let wev = GBin.event_box ~packing: (hbox#pack ~expand: false ~padding: 2) () in
- let wl = GMisc.label ~text: param.string_label ~packing: wev#add () in
+ let _wl = GMisc.label ~text: param.string_label ~packing: wev#add () in
let we = GEdit.entry
~editable: param.string_editable
~packing: (hbox#pack ~expand: param.string_expand ~padding: 2)
@@ -396,7 +396,7 @@ class combo_param_box param (tt:GData.tooltips) =
let _ = dbg "combo_param_box" in
let hbox = GPack.hbox () in
let wev = GBin.event_box ~packing: (hbox#pack ~expand: false ~padding: 2) () in
- let wl = GMisc.label ~text: param.combo_label ~packing: wev#add () in
+ let _wl = GMisc.label ~text: param.combo_label ~packing: wev#add () in
let wc = GEdit.combo
~popdown_strings: param.combo_choices
~value_in_list: (not param.combo_new_allowed)
@@ -754,9 +754,7 @@ class hotkey_param_box param (tt:GData.tooltips) =
let _ = dbg "hotkey_param_box" in
let hbox = GPack.hbox () in
let wev = GBin.event_box ~packing: (hbox#pack ~expand: false ~padding: 2) () in
- let wl = GMisc.label ~text: param.hk_label
- ~packing: wev#add ()
- in
+ let _wl = GMisc.label ~text: param.hk_label ~packing: wev#add () in
let we = GEdit.entry
~editable: false
~packing: (hbox#pack ~expand: param.hk_expand ~padding: 2)
@@ -805,9 +803,7 @@ class hotkey_param_box param (tt:GData.tooltips) =
class modifiers_param_box param =
let hbox = GPack.hbox () in
let wev = GBin.event_box ~packing: (hbox#pack ~expand: false ~padding: 2) () in
- let wl = GMisc.label ~text: param.md_label
- ~packing: wev#add ()
- in
+ let _wl = GMisc.label ~text: param.md_label ~packing: wev#add () in
let we = GEdit.entry
~editable: false
~packing: (hbox#pack ~expand: param.md_expand ~padding: 2)
diff --git a/ide/utils/uoptions.ml b/ide/utils/uoptions.ml
index 416f5769..aa3b42cd 100644
--- a/ide/utils/uoptions.ml
+++ b/ide/utils/uoptions.ml
@@ -24,7 +24,7 @@
(** Simple options:
This will enable very simple configuration, by a mouse-based configurator.
- Options will be defined by a special function, which will also check
+ Flags.will be defined by a special function, which will also check
if a value has been provided by the user in its .gwmlrc file.
The .gwmlrc will be created by a dedicated tool, which could be used
to generate both .gwmlrc and .efunsrc files.
@@ -151,7 +151,7 @@ let
opfile.file_rc) with
Not_found -> default_value
| e ->
- Printf.printf "Options.define_option, for option %s: "
+ Printf.printf "Flags.define_option, for option %s: "
(match option_name with
[] -> "???"
| name :: _ -> name);
@@ -344,7 +344,7 @@ let value_to_string v =
StringValue s -> s
| IntValue i -> string_of_int i
| FloatValue f -> string_of_float f
- | _ -> failwith "Options: not a string option"
+ | _ -> failwith "Flags. not a string option"
;;
let string_to_value s = StringValue s;;
@@ -353,7 +353,7 @@ let value_to_int v =
match v with
StringValue s -> int_of_string s
| IntValue i -> i
- | _ -> failwith "Options: not an int option"
+ | _ -> failwith "Flags. not an int option"
;;
let int_to_value i = IntValue i;;
@@ -375,7 +375,7 @@ let value_to_bool v =
StringValue s -> bool_of_string s
| IntValue v when v = 0 -> false
| IntValue v when v = 1 -> true
- | _ -> failwith "Options: not a bool option"
+ | _ -> failwith "Flags. not a bool option"
;;
let bool_to_value i = StringValue (string_of_bool i);;
@@ -383,7 +383,7 @@ let value_to_float v =
match v with
StringValue s -> float_of_string s
| FloatValue f -> f
- | _ -> failwith "Options: not a float option"
+ | _ -> failwith "Flags. not a float option"
;;
let float_to_value i = FloatValue i;;
@@ -392,7 +392,7 @@ let value_to_string2 v =
match v with
List [s1; s2] | SmallList [s1;s2] ->
value_to_string s1, value_to_string s2
- | _ -> failwith "Options: not a string2 option"
+ | _ -> failwith "Flags. not a string2 option"
;;
let string2_to_value (s1, s2) = SmallList [StringValue s1; StringValue s2];;
@@ -401,10 +401,10 @@ let value_to_list v2c v =
match v with
List l | SmallList l -> List.rev (List.rev_map v2c l)
| StringValue s -> failwith (Printf.sprintf
- "Options: not a list option (StringValue [%s])" s)
- | FloatValue _ -> failwith "Options: not a list option (FloatValue)"
- | IntValue _ -> failwith "Options: not a list option (IntValue)"
- | Module _ -> failwith "Options: not a list option (Module)"
+ "Flags. not a list option (StringValue [%s])" s)
+ | FloatValue _ -> failwith "Flags. not a list option (FloatValue)"
+ | IntValue _ -> failwith "Flags. not a list option (IntValue)"
+ | Module _ -> failwith "Flags. not a list option (Module)"
;;
let list_to_value c2v l =
@@ -458,7 +458,7 @@ let from_value cl = cl.from_value;;
let value_to_sum l v =
match v with
StringValue s -> List.assoc s l
- | _ -> failwith "Options: not a sum option"
+ | _ -> failwith "Flags. not a sum option"
;;
let sum_to_value l v = StringValue (List.assq v l);;
@@ -659,8 +659,8 @@ let value_to_tuple2 (c1, c2) v =
| List l | SmallList l ->
Printf.printf "list of %d" (List.length l);
print_newline ();
- failwith "Options: not a tuple2 list option"
- | _ -> failwith "Options: not a tuple2 option"
+ failwith "Flags. not a tuple2 list option"
+ | _ -> failwith "Flags. not a tuple2 option"
;;
let tuple2_option p =
@@ -675,7 +675,7 @@ let value_to_tuple3 (c1, c2, c3) v =
List [v1; v2; v3] -> from_value c1 v1, from_value c2 v2, from_value c3 v3
| SmallList [v1; v2; v3] ->
from_value c1 v1, from_value c2 v2, from_value c3 v3
- | _ -> failwith "Options: not a tuple3 option"
+ | _ -> failwith "Flags. not a tuple3 option"
;;
let tuple3_option p =
@@ -691,7 +691,7 @@ let value_to_tuple4 (c1, c2, c3, c4) v =
(from_value c1 v1, from_value c2 v2, from_value c3 v3, from_value c4 v4)
| SmallList [v1; v2; v3; v4] ->
(from_value c1 v1, from_value c2 v2, from_value c3 v3, from_value c4 v4)
- | _ -> failwith "Options: not a tuple4 option"
+ | _ -> failwith "Flags. not a tuple4 option"
;;
let tuple4_option p =
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 02:04:05 +0000