# HG changeset patch
# User Simon Heimberg <[email protected]>
# Date 1238154241 -3600
# Node ID 00299bec80f3d9497e936bc3195677cf2a0121fd
# Parent 1fb9c97bae63ff21f76f707c17e0b9814a732a82
iconoverlay win: more icons
Icons are already registered with TortoseOverlays, no additional resources
diff -r 1fb9c97bae63 -r 00299bec80f3 tortoise/iconoverlay.py
--- a/tortoise/iconoverlay.py Don Mär 26 18:27:39 2009 +0100
+++ b/tortoise/iconoverlay.py Fre Mär 27 12:44:01 2009 +0100
@@ -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)
diff -r 1fb9c97bae63 -r 00299bec80f3 tortoisehg.py
--- a/tortoisehg.py Don Mär 26 18:27:39 2009 +0100
+++ b/tortoisehg.py Fre Mär 27 12:44:01 2009 +0100
@@ -15,7 +15,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
@@ -48,17 +51,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):
------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
