[meld] Bug 584172 Add an icon for missing items.

[Stephen Kennedy <stevek src gnome org>]

commit 3749abaada5819756557e31d81d53c96ff862c3c
Author: Stephen Kennedy <stevek gnome org>
Date:   Fri May 29 22:45:11 2009 +0100

    Bug 584172 Add an icon for missing items.
    Made the "normal" state a little darker for contrast.
---
 dirdiff.py                             |    7 +++++--
 glade2/pixmaps/tree-file-missing.png   |  Bin 0 -> 2191 bytes
 glade2/pixmaps/tree-file-normal.png    |  Bin 2181 -> 2250 bytes
 glade2/pixmaps/tree-folder-missing.png |  Bin 0 -> 1095 bytes
 tree.py                                |    4 +++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dirdiff.py b/dirdiff.py
index 59251f9..0c5c5b9 100644
--- a/dirdiff.py
+++ b/dirdiff.py
@@ -788,6 +788,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
             all_same = 0
             all_present_same = _files_same( lof, self.regexes )
         different = 1
+        one_isdir = [None for i in range(self.model.ntree)]
         for j in range(self.model.ntree):
             if mod_times[j]:
                 isdir = os.path.isdir( files[j] )
@@ -804,8 +805,10 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
                 self.model.set_value(it,
                     self.model.column_index(COL_EMBLEM, j),
                     j == newest_index and pixbuf_newer or None)
-            else:
-                self.model.set_state(it, j,  tree.STATE_MISSING)
+                one_isdir[j] = isdir
+        for j in range(self.model.ntree):
+            if not mod_times[j]:
+                self.model.set_state(it, j, tree.STATE_MISSING, True in one_isdir)
         return different
 
     def popup_in_pane(self, pane):
diff --git a/glade2/pixmaps/tree-file-missing.png b/glade2/pixmaps/tree-file-missing.png
new file mode 100644
index 0000000..240aca7
Binary files /dev/null and b/glade2/pixmaps/tree-file-missing.png differ
diff --git a/glade2/pixmaps/tree-file-normal.png b/glade2/pixmaps/tree-file-normal.png
index 557d746..a3ca9fe 100644
Binary files a/glade2/pixmaps/tree-file-normal.png and b/glade2/pixmaps/tree-file-normal.png differ
diff --git a/glade2/pixmaps/tree-folder-missing.png b/glade2/pixmaps/tree-folder-missing.png
new file mode 100644
index 0000000..75c9095
Binary files /dev/null and b/glade2/pixmaps/tree-folder-missing.png differ
diff --git a/tree.py b/tree.py
index 54a030a..01394d7 100644
--- a/tree.py
+++ b/tree.py
@@ -31,9 +31,11 @@ load = lambda x,s=14: gnomeglade.load_pixbuf( paths.share_dir("glade2/pixmaps",x
 pixbuf_folder = load("tree-folder-normal.png", 20)
 pixbuf_folder_new = load("tree-folder-new.png", 20)
 pixbuf_folder_changed = load("tree-folder-changed.png", 20)
+pixbuf_folder_missing = load("tree-folder-missing.png", 20)
 pixbuf_file = load("tree-file-normal.png")
 pixbuf_file_new = load("tree-file-new.png")
 pixbuf_file_changed = load("tree-file-changed.png")
+pixbuf_file_missing = load("tree-file-missing.png")
 
 class DiffTreeStore(gtk.TreeStore):
     def __init__(self, ntree = 3, num_col = COL_END):
@@ -69,7 +71,7 @@ class DiffTreeStore(gtk.TreeStore):
             (pixbuf_file_changed, pixbuf_folder_changed), # MODIFIED
             (pixbuf_file_changed, pixbuf_folder_changed), # CONFLICT
             (pixbuf_file_changed, pixbuf_folder_changed), # REMOVED
-            (None, None) # MISSING
+            (pixbuf_file_missing, pixbuf_folder_missing) # MISSING
         ]
         assert len(self.pixstyle) == STATE_MAX