Merge branch 'master' of https://github.com/godotengine/godot

7 files changed, 245 insertions, 258 deletions

diff --git a/tools/scripts/addheader.py b/tools/scripts/addheader.py
index d040d8b5d6..056e807c81 100644
--- a/tools/scripts/addheader.py
+++ b/tools/scripts/addheader.py
@@ -1,4 +1,4 @@
-header="""\
+header = """\
 /*************************************************************************/
 /*  $filename                                                            */
 /*************************************************************************/
@@ -6,7 +6,7 @@ header="""\
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -29,44 +29,42 @@ header="""\
 /*************************************************************************/
 """
 
-f = open("files","rb")
+f = open("files", "rb")
 
 fname = f.readline()
-while (fname!=""):
+while (fname != ""):
 
-  fr = open(fname.strip(),"rb")
-  l = fr.readline()
-  bc=False
-  fsingle = fname.strip()
+    fr = open(fname.strip(), "rb")
+    l = fr.readline()
+    bc = False
+    fsingle = fname.strip()
 
-  if (fsingle.find("/")!=-1):
-    fsingle=fsingle[fsingle.rfind("/")+1:]
-  rep_fl="$filename"
-  rep_fi=fsingle
-  len_fl=len(rep_fl)
-  len_fi=len(rep_fi)
-  if (len_fi<len_fl):
-    for x in range(len_fl-len_fi):
-      rep_fi+=" "
-  elif (len_fl<len_fi):
-    for x in range(len_fi-len_fl):
-      rep_fl+=" "
-  if (header.find(rep_fl)!=-1):
-    text=header.replace(rep_fl,rep_fi)
-  else:
-    text=header.replace("$filename",fsingle)
+    if (fsingle.find("/") != -1):
+        fsingle = fsingle[fsingle.rfind("/") + 1:]
+    rep_fl = "$filename"
+    rep_fi = fsingle
+    len_fl = len(rep_fl)
+    len_fi = len(rep_fi)
+    if (len_fi < len_fl):
+        for x in range(len_fl - len_fi):
+            rep_fi += " "
+    elif (len_fl < len_fi):
+        for x in range(len_fi - len_fl):
+            rep_fl += " "
+    if (header.find(rep_fl) != -1):
+        text = header.replace(rep_fl, rep_fi)
+    else:
+        text = header.replace("$filename", fsingle)
 
+    while (l != ""):
+        if ((l.find("//") != 0 and l.find("/*") != 0 and l.strip() != "") or bc):
+            text += l
+            bc = True
+        l = fr.readline()
 
-  while (l!=""):
-    if ((l.find("//")!=0 and  l.find("/*")!=0 and l.strip()!="") or bc):
-      text+=l
-      bc=True
-    l=fr.readline()
-
-  fr.close()
-  fr=open(fname.strip(),"wb")
-  fr.write(text)
-  fr.close()
-  #print(text)
-  fname=f.readline()
-
+    fr.close()
+    fr = open(fname.strip(), "wb")
+    fr.write(text)
+    fr.close()
+    # print(text)
+    fname = f.readline()
diff --git a/tools/scripts/file-hex-array.py b/tools/scripts/file-hex-array.py
index 05352396f1..a6cdfe541f 100755
--- a/tools/scripts/file-hex-array.py
+++ b/tools/scripts/file-hex-array.py
@@ -2,34 +2,38 @@ import binascii
 import os.path
 import sys
 
+
 def tof(filepath):
-	with open(filepath, 'r') as f:
-	    content = f.read()
-	content = content.replace("0x","")
-	content = content.split(',')
-	for i in range(len(content)):
-		if len(content[i]) == 1: content[i] = "0" + content[i]
-	content = "".join(content)
-	with open(filepath+".file", 'wb') as f:
-	    content = f.write(content.decode("hex"))
-	print(os.path.basename(filepath)+".file created.")
-	exit(0)
+    with open(filepath, 'r') as f:
+        content = f.read()
+    content = content.replace("0x", "")
+    content = content.split(',')
+    for i in range(len(content)):
+        if len(content[i]) == 1:
+            content[i] = "0" + content[i]
+    content = "".join(content)
+    with open(filepath + ".file", 'wb') as f:
+        content = f.write(content.decode("hex"))
+    print(os.path.basename(filepath) + ".file created.")
+    exit(0)
+
 
 def toa(filepath):
-	with open(filepath, 'rb') as f:
-	    content = f.read()
-	content = binascii.hexlify(content)
-	content = [content[i:i+2] for i in range(0, len(content), 2)]
-	content = ",0x".join(content)
-	content = "0x" + content
-	content = content.replace("0x00","0x0")
-	with open(filepath+".array", 'w') as f:
-	    content = f.write(content)
-	print(os.path.basename(filepath)+".array created.")
-	exit(0)
+    with open(filepath, 'rb') as f:
+        content = f.read()
+    content = binascii.hexlify(content)
+    content = [content[i:i + 2] for i in range(0, len(content), 2)]
+    content = ",0x".join(content)
+    content = "0x" + content
+    content = content.replace("0x00", "0x0")
+    with open(filepath + ".array", 'w') as f:
+        content = f.write(content)
+    print(os.path.basename(filepath) + ".array created.")
+    exit(0)
+
 
 def usage():
-	print("========================================================\n\
+    print("========================================================\n\
 #\n\
 # Usage: python file-hex-array.py [action] [option]\n\
 #\n\
@@ -40,13 +44,13 @@ def usage():
 # Example : python file-hex-array.py toa 1.png\n\
 #\n\
 ========================================================")
-	exit(1)
+    exit(1)
 
 if len(sys.argv) != 3:
-	usage()
+    usage()
 if sys.argv[1] == "toa" and os.path.isfile(sys.argv[2]):
-	toa(sys.argv[2])
+    toa(sys.argv[2])
 elif sys.argv[1] == "tof" and os.path.isfile(sys.argv[2]):
-	tof(sys.argv[2])
+    tof(sys.argv[2])
 else:
-	usage()
\ No newline at end of file
+    usage()
diff --git a/tools/scripts/make_bmfhdr.py b/tools/scripts/make_bmfhdr.py
index 0f6f453004..1d3c40f9c6 100644
--- a/tools/scripts/make_bmfhdr.py
+++ b/tools/scripts/make_bmfhdr.py
@@ -2,69 +2,66 @@
 
 import sys
 
-if (len(sys.argv)!=2):
-  print("Pass me a .fnt argument!")
+if (len(sys.argv) != 2):
+    print("Pass me a .fnt argument!")
 
-f = open(sys.argv[1],"rb")
+f = open(sys.argv[1], "rb")
 
-name = sys.argv[1].lower().replace(".fnt","")
+name = sys.argv[1].lower().replace(".fnt", "")
 
 l = f.readline()
 
-font_height=0
-font_ascent=0
-font_charcount=0
-font_chars=[]
-font_cc=0
-
-while(l!=""):
-
-  fs = l.strip().find(" ")
-  if (fs==-1):
-    l=f.readline()
-    continue
-  t  = l[0:fs]
-
-  dv = l[fs+1:].split(" ")
-  d = {}
-  for x in dv:
-    if (x.find("=")==-1):
-      continue
-    s = x.split("=")
-    d[ s[0] ] = s[1]
-
-
-  if (t=="common"):
-    font_height=d["lineHeight"]
-    font_ascent=d["base"]
-
-  if (t=="char"):
-    font_chars.append(d["id"])
-    font_chars.append(d["x"])
-    font_chars.append(d["y"])
-    font_chars.append(d["width"])
-    font_chars.append(d["height"])
-    font_chars.append(d["xoffset"])
-    font_chars.append(d["yoffset"])
-    font_chars.append(d["xadvance"])
-    font_cc+=1
-
-
-
-  l = f.readline()
-
-
-print("static const int _bi_font_"+name+"_height="+str(font_height)+";")
-print("static const int _bi_font_"+name+"_ascent="+str(font_ascent)+";")
-print("static const int _bi_font_"+name+"_charcount="+str(font_cc)+";")
-cstr="static const int _bi_font_"+name+"_characters={"
+font_height = 0
+font_ascent = 0
+font_charcount = 0
+font_chars = []
+font_cc = 0
+
+while(l != ""):
+
+    fs = l.strip().find(" ")
+    if (fs == -1):
+        l = f.readline()
+        continue
+    t = l[0:fs]
+
+    dv = l[fs + 1:].split(" ")
+    d = {}
+    for x in dv:
+        if (x.find("=") == -1):
+            continue
+        s = x.split("=")
+        d[s[0]] = s[1]
+
+    if (t == "common"):
+        font_height = d["lineHeight"]
+        font_ascent = d["base"]
+
+    if (t == "char"):
+        font_chars.append(d["id"])
+        font_chars.append(d["x"])
+        font_chars.append(d["y"])
+        font_chars.append(d["width"])
+        font_chars.append(d["height"])
+        font_chars.append(d["xoffset"])
+        font_chars.append(d["yoffset"])
+        font_chars.append(d["xadvance"])
+        font_cc += 1
+
+    l = f.readline()
+
+
+print("static const int _bi_font_" + name + "_height=" + str(font_height) + ";")
+print("static const int _bi_font_" + name + "_ascent=" + str(font_ascent) + ";")
+print("static const int _bi_font_" + name + "_charcount=" + str(font_cc) + ";")
+cstr = "static const int _bi_font_" + name + "_characters={"
 for i in range(len(font_chars)):
 
-  c=font_chars[i]
-  if (i>0):
-    cstr+=", "
-  cstr+=c
+    c = font_chars[i]
+    if (i > 0):
+        cstr += ", "
+    cstr += c
 
-cstr+=("};")
+cstr += ("};")
 
-print(cstr)
\ No newline at end of file
+print(cstr)
diff --git a/tools/scripts/make_glwrapper.py b/tools/scripts/make_glwrapper.py
index b4c582f1eb..5694d2327e 100644
--- a/tools/scripts/make_glwrapper.py
+++ b/tools/scripts/make_glwrapper.py
@@ -1,32 +1,32 @@
 #! /usr/bin/env python
 import sys
 
-if (len(sys.argv)<2):
-  print("usage: make_glwrapper.py <headers>")
-  sys.exit(255)
+if (len(sys.argv) < 2):
+    print("usage: make_glwrapper.py <headers>")
+    sys.exit(255)
 
 
-functions=[]
-types=[]
-constants=[]
+functions = []
+types = []
+constants = []
 
-READ_FUNCTIONS=0
-READ_TYPES=1
-READ_CONSTANTS=2
+READ_FUNCTIONS = 0
+READ_TYPES = 1
+READ_CONSTANTS = 2
 
-read_what=READ_TYPES
+read_what = READ_TYPES
 
-for x in (range(len(sys.argv)-1)):
-  f=open(sys.argv[x+1],"r")
+for x in (range(len(sys.argv) - 1)):
+    f = open(sys.argv[x + 1], "r")
 
-  while(True):
+    while(True):
 
-    line=f.readline()
-    if (line==""):
-      break
+        line = f.readline()
+        if (line == ""):
+            break
 
-    line=line.replace("\n","").strip()
-    """
+        line = line.replace("\n", "").strip()
+        """
     if (line.find("[types]")!=-1):
       read_what=READ_TYPES
       continue
@@ -38,67 +38,66 @@ for x in (range(len(sys.argv)-1)):
       continue
      """
 
-    if (line.find("#define")!=-1):
-      if (line.find("0x")==-1 and line.find("GL_VERSION")==-1):
-        continue
-      constants.append(line)
-    elif (line.find("typedef")!=-1):
-      if (line.find("(")!=-1 or line.find(")")!=-1 or line.find("ARB")!=-1 or line.find("EXT")!=-1 or line.find("GL")==-1):
-        continue
-      types.append(line)
-    elif (line.find("APIENTRY")!=-1 and line.find("GLAPI")!=-1):
+        if (line.find("#define") != -1):
+            if (line.find("0x") == -1 and line.find("GL_VERSION") == -1):
+                continue
+            constants.append(line)
+        elif (line.find("typedef") != -1):
+            if (line.find("(") != -1 or line.find(")") != -1 or line.find("ARB") != -1 or line.find("EXT") != -1 or line.find("GL") == -1):
+                continue
+            types.append(line)
+        elif (line.find("APIENTRY") != -1 and line.find("GLAPI") != -1):
 
-      if (line.find("ARB")!=-1 or line.find("EXT")!=-1 or line.find("NV")!=-1):
-        continue
+            if (line.find("ARB") != -1 or line.find("EXT") != -1 or line.find("NV") != -1):
+                continue
 
-      line=line.replace("APIENTRY","")
-      line=line.replace("GLAPI","")
+            line = line.replace("APIENTRY", "")
+            line = line.replace("GLAPI", "")
 
-      glpos=line.find(" gl")
-      if (glpos==-1):
+            glpos = line.find(" gl")
+            if (glpos == -1):
 
-       glpos=line.find("\tgl")
-       if (glpos==-1):
-          continue
+                glpos = line.find("\tgl")
+                if (glpos == -1):
+                    continue
 
-      ret=line[:glpos].strip();
+            ret = line[:glpos].strip()
 
-      line=line[glpos:].strip()
-      namepos=line.find("(")
+            line = line[glpos:].strip()
+            namepos = line.find("(")
 
-      if (namepos==-1):
-        continue
+            if (namepos == -1):
+                continue
 
-      name=line[:namepos].strip()
-      line=line[namepos:]
+            name = line[:namepos].strip()
+            line = line[namepos:]
 
-      argpos=line.rfind(")")
-      if (argpos==-1):
-        continue
+            argpos = line.rfind(")")
+            if (argpos == -1):
+                continue
 
-      args=line[1:argpos]
+            args = line[1:argpos]
 
-      funcdata={}
-      funcdata["ret"]=ret
-      funcdata["name"]=name
-      funcdata["args"]=args
+            funcdata = {}
+            funcdata["ret"] = ret
+            funcdata["name"] = name
+            funcdata["args"] = args
 
-      functions.append(funcdata)
-      print(funcdata)
+            functions.append(funcdata)
+            print(funcdata)
 
 
+# print(types)
+# print(constants)
+# print(functions)
 
-#print(types)
-#print(constants)
-#print(functions)
 
-
-f=open("glwrapper.h","w")
+f = open("glwrapper.h", "w")
 
 f.write("#ifndef GL_WRAPPER\n")
 f.write("#define GL_WRAPPER\n\n\n")
 
-header_code="""\
+header_code = """\
 #if defined(__gl_h_) || defined(__GL_H__)
 #error gl.h included before glwrapper.h
 #endif
@@ -128,56 +127,52 @@ header_code="""\
 
 f.write("#include <stddef.h>\n\n\n")
 
-f.write(header_code);
+f.write(header_code)
 
 f.write("#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n\n")
 f.write("#if defined(_WIN32) && !defined(__CYGWIN__)\n")
 f.write("#define GLWRP_APIENTRY __stdcall\n")
-f.write("#else\n");
+f.write("#else\n")
 f.write("#define GLWRP_APIENTRY \n")
-f.write("#endif\n\n");
+f.write("#endif\n\n")
 for x in types:
-  f.write(x+"\n")
+    f.write(x + "\n")
 
 f.write("\n\n")
 
 for x in constants:
-  f.write(x+"\n")
+    f.write(x + "\n")
 
 f.write("\n\n")
 
 for x in functions:
-  f.write("extern "+x["ret"]+" GLWRP_APIENTRY (*__wrapper_"+x["name"]+")("+x["args"]+");\n")
-  f.write("#define "+x["name"]+" __wrapper_"+x["name"]+"\n")
+    f.write("extern " + x["ret"] + " GLWRP_APIENTRY (*__wrapper_" + x["name"] + ")(" + x["args"] + ");\n")
+    f.write("#define " + x["name"] + " __wrapper_" + x["name"] + "\n")
 
 f.write("\n\n")
-f.write("typedef void (*GLWrapperFuncPtr)(void);\n\n");
+f.write("typedef void (*GLWrapperFuncPtr)(void);\n\n")
 f.write("void glWrapperInit( GLWrapperFuncPtr (*wrapperFunc)(const char*) );\n")
 
 f.write("#ifdef __cplusplus\n}\n#endif\n")
 
 f.write("#endif\n\n")
 
-f=open("glwrapper.c","w")
+f = open("glwrapper.c", "w")
 
 f.write("\n\n")
 f.write("#include \"glwrapper.h\"\n")
 f.write("\n\n")
 
 for x in functions:
-  f.write(x["ret"]+" GLWRP_APIENTRY (*__wrapper_"+x["name"]+")("+x["args"]+")=NULL;\n")
+    f.write(x["ret"] + " GLWRP_APIENTRY (*__wrapper_" + x["name"] + ")(" + x["args"] + ")=NULL;\n")
 
 f.write("\n\n")
 f.write("void glWrapperInit( GLWrapperFuncPtr (*wrapperFunc)(const char*) )  {\n")
 f.write("\n")
 
 for x in functions:
-  f.write("\t__wrapper_"+x["name"]+"=("+x["ret"]+" GLWRP_APIENTRY (*)("+x["args"]+"))wrapperFunc(\""+x["name"]+"\");\n")
+    f.write("\t__wrapper_" + x["name"] + "=(" + x["ret"] + " GLWRP_APIENTRY (*)(" + x["args"] + "))wrapperFunc(\"" + x["name"] + "\");\n")
 
 f.write("\n\n")
 f.write("}\n")
 f.write("\n\n")
-
-
-
-
diff --git a/tools/scripts/makeargs.py b/tools/scripts/makeargs.py
index 8c5539c5fe..2cd47ae087 100644
--- a/tools/scripts/makeargs.py
+++ b/tools/scripts/makeargs.py
@@ -1,5 +1,5 @@
 
-text="""
+text = """
 #define FUNC$numR(m_r,m_func,$argt)\\
 	virtual m_r m_func($argtp) { \\
 		if (Thread::get_caller_ID()!=server_thread) {\\
@@ -64,25 +64,19 @@ text="""
 """
 
 
+for i in range(1, 8):
 
-for i in range(1,8):
-
-	tp=""
-	p=""
-	t=""
-	for j in range(i):
-		if (j>0):
-			tp+=", "
-			p+=", "
-			t+=", "
-		tp +=("m_arg"+str(j+1)+" p"+str(j+1))
-		p+=("p"+str(j+1))
-		t+=("m_arg"+str(j+1))
-
-	t = text.replace("$argtp",tp).replace("$argp",p).replace("$argt",t).replace("$num",str(i))
-	print(t)
-
-
-
-
+    tp = ""
+    p = ""
+    t = ""
+    for j in range(i):
+        if (j > 0):
+            tp += ", "
+            p += ", "
+            t += ", "
+        tp += ("m_arg" + str(j + 1) + " p" + str(j + 1))
+        p += ("p" + str(j + 1))
+        t += ("m_arg" + str(j + 1))
 
+    t = text.replace("$argtp", tp).replace("$argp", p).replace("$argt", t).replace("$num", str(i))
+    print(t)
diff --git a/tools/scripts/memsort.py b/tools/scripts/memsort.py
index d2e4fe0226..fb636b0f78 100644
--- a/tools/scripts/memsort.py
+++ b/tools/scripts/memsort.py
@@ -1,35 +1,35 @@
 
 import sys
 
-arg="memdump.txt"
+arg = "memdump.txt"
 
-if (len(sys.argv)>1):
-	arg=sys.argv[1]
+if (len(sys.argv) > 1):
+    arg = sys.argv[1]
 
-f = open(arg,"rb")
+f = open(arg, "rb")
 
 
-l=f.readline()
+l = f.readline()
 
 
 sum = {}
-cnt={}
+cnt = {}
 
 
-while(l!=""):
+while(l != ""):
 
-	s=l.split("-")
-	amount = int(s[1])
-	what=s[2]
-	if (what in sum):
-		sum[what]+=amount
-		cnt[what]+=1
-	else:
-		sum[what]=amount
-		cnt[what]=1
+    s = l.split("-")
+    amount = int(s[1])
+    what = s[2]
+    if (what in sum):
+        sum[what] += amount
+        cnt[what] += 1
+    else:
+        sum[what] = amount
+        cnt[what] = 1
 
-	l=f.readline()
+    l = f.readline()
 
 
 for x in sum:
-	print(x.strip()+"("+str(cnt[x])+"):\n: "+str(sum[x]))
+    print(x.strip() + "(" + str(cnt[x]) + "):\n: " + str(sum[x]))
diff --git a/tools/scripts/svgs_2_pngs.py b/tools/scripts/svgs_2_pngs.py
index 879926ab42..b24324dcd7 100644
--- a/tools/scripts/svgs_2_pngs.py
+++ b/tools/scripts/svgs_2_pngs.py
@@ -51,7 +51,7 @@ def export_icons():
         # name without extensions
         name_only = file_name.replace('.svg', '')
 
-        out_icon_names = [name_only] # export to a png with the same file name
+        out_icon_names = [name_only]  # export to a png with the same file name
         theme_out_icon_names = []
         # special cases
         if special_icons.has_key(name_only):
@@ -73,7 +73,6 @@ def export_icons():
             svg_to_png(source_path, theme_dir_base + theme_out_icon_name, 90)
 
 
-
 def export_theme():
     svgs_path = theme_dir_source
     file_names = [f for f in listdir(svgs_path) if isfile(join(svgs_path, f))]
@@ -82,7 +81,7 @@ def export_theme():
         # name without extensions
         name_only = file_name.replace('.svg', '')
 
-        out_icon_names = [name_only] # export to a png with the same file name
+        out_icon_names = [name_only]  # export to a png with the same file name
         # special cases
         if theme_icons.has_key(name_only):
             special_icon = theme_icons[name_only]
@@ -102,36 +101,36 @@ special_icons = {
         output_names=['icon_add'],
         theme_output_names=['icon_add', 'icon_zoom_more']
     ),
-    'icon_new': dict( output_names=['icon_file'] ),
-    'icon_animation_tree_player': dict( output_names=['icon_animation_tree'] ),
+    'icon_new': dict(output_names=['icon_file']),
+    'icon_animation_tree_player': dict(output_names=['icon_animation_tree']),
     'icon_tool_rotate': dict(
         output_names=['icon_reload'],
-        theme_output_names= ['icon_reload']
+        theme_output_names=['icon_reload']
     ),
-    'icon_multi_edit': dict( output_names=['icon_multi_node_edit'] ),
+    'icon_multi_edit': dict(output_names=['icon_multi_node_edit']),
     'icon_folder': dict(
         output_names=['icon_load', 'icon_open'],
-        theme_output_names= ['icon_folder']
+        theme_output_names=['icon_folder']
     ),
-    'icon_file_list': dict( output_names=['icon_enum'] ),
-    'icon_collision_2d': dict( output_names=['icon_collision_polygon_2d', 'icon_polygon_2d'] ),
-    'icon_class_list': dict( output_names=['icon_filesystem'] ),
-    'icon_color_ramp': dict( output_names=['icon_graph_color_ramp'] ),
-    'icon_translation': dict( output_names=['icon_p_hash_translation'] ),
-    'icon_shader': dict( output_names=['icon_shader_material', 'icon_material_shader'] ),
-    'icon_canvas_item_shader_graph': dict( output_names=['icon_material_shader_graph'] ),
-
-    'icon_color_pick': dict( theme_output_names= ['icon_color_pick'], avoid_self=True ),
-    'icon_play': dict( theme_output_names= ['icon_play'] ),
-    'icon_stop': dict( theme_output_names= ['icon_stop'] ),
-    'icon_zoom_less': dict( theme_output_names= ['icon_zoom_less'], avoid_self=True ),
-    'icon_zoom_reset': dict( theme_output_names= ['icon_zoom_reset'], avoid_self=True ),
+    'icon_file_list': dict(output_names=['icon_enum']),
+    'icon_collision_2d': dict(output_names=['icon_collision_polygon_2d', 'icon_polygon_2d']),
+    'icon_class_list': dict(output_names=['icon_filesystem']),
+    'icon_color_ramp': dict(output_names=['icon_graph_color_ramp']),
+    'icon_translation': dict(output_names=['icon_p_hash_translation']),
+    'icon_shader': dict(output_names=['icon_shader_material', 'icon_material_shader']),
+    'icon_canvas_item_shader_graph': dict(output_names=['icon_material_shader_graph']),
+
+    'icon_color_pick': dict(theme_output_names=['icon_color_pick'], avoid_self=True),
+    'icon_play': dict(theme_output_names=['icon_play']),
+    'icon_stop': dict(theme_output_names=['icon_stop']),
+    'icon_zoom_less': dict(theme_output_names=['icon_zoom_less'], avoid_self=True),
+    'icon_zoom_reset': dict(theme_output_names=['icon_zoom_reset'], avoid_self=True),
     'icon_snap': dict(theme_output_names=['icon_snap'])
 }
 
 theme_icons = {
-      'icon_close': dict(output_names=['close', 'close_hl']),
-      'tab_menu': dict(output_names=['tab_menu_hl'])
+    'icon_close': dict(output_names=['close', 'close_hl']),
+    'tab_menu': dict(output_names=['tab_menu_hl'])
 }
 
 export_icons()