Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-05 15:30:08 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[tools] propsal to use meld instead of tkdiff, which is nowadays removed from ubuntu repo

Browse Source
This commit is contained in:
Dino Hensen
2013-03-19 22:18:22 +01:00
parent 5537fd342f
commit 7082154183
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/supervision/paparazzicenter.ml
+2 -2
View File
@@ -135,7 +135,7 @@ let quit_button_callback = fun gui ac_combo session_combo target_combo () ->
Sys.rename Utils.backup_xml_file Utils.conf_xml_file; Sys.rename Utils.backup_xml_file Utils.conf_xml_file;
quit_callback gui ac_combo session_combo target_combo () quit_callback gui ac_combo session_combo target_combo ()
| 3 -> | 3 ->
ignore (Sys.command (sprintf "tkdiff %s %s" Utils.backup_xml_file Utils.conf_xml_file)); ignore (Sys.command (sprintf "meld %s %s" Utils.backup_xml_file Utils.conf_xml_file));
question_box () question_box ()
| 1 -> | 1 ->
Sys.remove Utils.backup_xml_file; Sys.remove Utils.backup_xml_file;
@@ -175,7 +175,7 @@ let () =
let rec question_box = fun () -> let rec question_box = fun () ->
match GToolbox.question_box ~title:"Backup" ~buttons:["Keep changes"; "Discard changes"; "View changes"] ~default:2 "Configuration changes made during the last session were not saved. ?" with match GToolbox.question_box ~title:"Backup" ~buttons:["Keep changes"; "Discard changes"; "View changes"] ~default:2 "Configuration changes made during the last session were not saved. ?" with
| 2 -> Sys.rename Utils.backup_xml_file Utils.conf_xml_file | 2 -> Sys.rename Utils.backup_xml_file Utils.conf_xml_file
| 3 -> ignore (Sys.command (sprintf "tkdiff %s %s" Utils.backup_xml_file Utils.conf_xml_file)); question_box () | 3 -> ignore (Sys.command (sprintf "meld %s %s" Utils.backup_xml_file Utils.conf_xml_file)); question_box ()
| _ -> Sys.remove Utils.backup_xml_file in | _ -> Sys.remove Utils.backup_xml_file in
question_box () question_box ()
end; end;