X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=filetree_markup.ml;h=b5728fa62cf30c7c2ad114f1a5adb09050f36442;hb=09ea87581a3b9004075c3e76450db821c1db4d0b;hp=a890cca3cb16eef883af4d024952764509fa4ff3;hpb=f09bb82de01019f24411cac2916d9567b5e9a235;p=guestfs-browser.git
diff --git a/filetree_markup.ml b/filetree_markup.ml
index a890cca..b5728fa 100644
--- a/filetree_markup.ml
+++ b/filetree_markup.ml
@@ -18,12 +18,10 @@
open ExtString
open ExtList
-open CamomileLibrary
-open Default.Camomile
open Unix
open Utils
-open Filetree_type
+open Slave_types
open Printf
@@ -47,15 +45,15 @@ let other_color = file_color (* anything not one of the above *)
* http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html
*)
let rec markup_of_name ?(visited = false) direntry =
- let name = direntry.Slave.dent_name in
- let mode = direntry.Slave.dent_stat.Guestfs.mode in
+ let name = direntry.dent_name in
+ let mode = direntry.dent_stat.Guestfs.mode in
if is_directory mode then ( (* directory *)
let fg = if not visited then normal dir_color else darken dir_color in
sprintf "%s"
fg (markup_escape name)
)
else if is_symlink mode then ( (* symlink *)
- let link = direntry.Slave.dent_link in
+ let link = direntry.dent_link in
let fg =
if not visited then normal symlink_color else darken symlink_color in
sprintf "%s %s %s"
@@ -200,30 +198,3 @@ let markup_of_regvaluetype h value =
let markup_of_regvaluesize h value =
let _, len = Hivex.value_type h value in
sprintf "%d" len
-
-(* This is a bit of a hack. Ideally just setting 'visited' would
- * darken the colour when the cell was re-rendered. However that would
- * mean we couldn't store other stuff in the name column. Therefore,
- * repopulate the name column.
- *)
-let set_visited ({ model = model; name_col = name_col } as t) row =
- let hdata = get_hdata t row in
- if hdata.visited = false then (
- hdata.visited <- true;
- match hdata.content with
- | Directory direntry | File direntry ->
- debug "set_visited %s" direntry.Slave.dent_name;
- model#set ~row ~column:name_col
- (markup_of_name ~visited:true direntry)
- | RegKey node ->
- debug "set_visited RegKey";
- let h = Option.get hdata.hiveh in
- model#set ~row ~column:name_col
- (markup_of_regkey ~visited:true h node)
- | RegValue value ->
- debug "set_visited RegValue";
- let h = Option.get hdata.hiveh in
- model#set ~row ~column:name_col
- (markup_of_regvalue ~visited:true h value)
- | Loading | ErrorMessage _ | Info _ | Top _ | TopWinReg _ -> ()
- )