Changeset 1d6b2d166f60…
Parent df97b3a80f22…
by
Changes to 2 files · Browse files at 1d6b2d166f60 Showing diff from parent df97b3a80f22 Diff from another changeset...
@@ -107,3 +107,5 @@ make_icon_overlay("Changed", "Modified", modified, THG_CLSID)
make_icon_overlay("Unchanged", "Normal", cachethg.UNCHANGED, THG_CLSID)
make_icon_overlay("Added", "Added", cachethg.ADDED, THG_CLSID)
+make_icon_overlay("Ignored", "Ignored", cachethg.IGNORED, THG_CLSID)
+make_icon_overlay("Conflict", "Conflict", cachethg.UNRESOLVED, THG_CLSID)
|
@@ -20,7 +20,10 @@
# shell extension classes
from tortoise.contextmenu import ContextMenuExtension
-from tortoise.iconoverlay import ChangedOverlay, AddedOverlay, UnchangedOverlay
+import tortoise.iconoverlay
+
+overlays = [getattr(tortoise.iconoverlay, overlay) for overlay in
+ tortoise.iconoverlay.__dict__ if overlay.endswith('Overlay')]
bin_path = os.path.dirname(os.path.join(os.getcwd(), sys.argv[0]))
print "bin path = ", bin_path
@@ -53,17 +56,15 @@def DllRegisterServer():
check_tortoise_overlays()
RegisterServer(ContextMenuExtension)
- RegisterServer(ChangedOverlay)
- RegisterServer(AddedOverlay)
- RegisterServer(UnchangedOverlay)
+ for overlay in overlays:
+ RegisterServer(overlay)
register_tortoise_path()
# for COM registration via py2exe
def DllUnregisterServer():
UnregisterServer(ContextMenuExtension)
- UnregisterServer(ChangedOverlay)
- UnregisterServer(AddedOverlay)
- UnregisterServer(UnchangedOverlay)
+ for for overlay in overlays:
+ UnregisterServer(overlay)
register_tortoise_path(unregister=True)
def RegisterServer(cls):
|
Loading...