some stuff is exact

[dana/openbox.git] / tools / themeupdate / themeupdate.py

diff --git a/tools/themeupdate/themeupdate.py b/tools/themeupdate/themeupdate.py
index cbf43ea..171be0b 100755 (executable)
--- a/tools/themeupdate/themeupdate.py
+++ b/tools/themeupdate/themeupdate.py
@@ -59,11 +59,22 @@ def simple_replace(data):
 def remove(data):
     invalid = []
     invalid.append('toolbar')
+    for inv in invalid:
+        while 1:
+            i, key, nul = find_key(data, inv)
+            if i >= 0:
+                out(key + ' is no longer supported.\nRemove (Y/n)? ')
+                if read_bool():
+                    out('Removing "' + key + '"\n')
+                    data.pop(i)
+            else:
+                break
     invalid.append('rootCommand')
+    invalid.append('menu.bullet')
     invalid.append('menu.frame.justify')
     for inv in invalid:
         while 1:
-            i, key, nul = find_key(data, inv)
+            i, key, nul = find_key(data, inv, True)
             if i >= 0:
                 out(key + ' is no longer supported.\nRemove (Y/n)? ')
                 if read_bool():
@@ -176,6 +187,7 @@ def pixelsize(data):
                     'specified by pixelsize. It is recommended that you use '
                     'pixelsize instead of pointsize for specifying theme '
                     'fonts. e.g. "sans:pixelsize=12"\n')
+                global valid
                 valid = False
 
 def warn_missing(data):
@@ -200,8 +212,7 @@ def err_missing(data):
 
 
 def usage():
-    print 'Usage: ' + sys.argv[0] + ' /path/to/themerc > newthemerc'
-    print
+    out('Usage: themupdate.py /path/to/themerc > newthemerc\n\n')
     sys.exit()
 
 try:
@@ -209,8 +220,7 @@ try:
 except IndexError:
     usage()
 except IOError:
-    print 'Unable to open file "' + sys.argv[1] + '"'
-    print
+    out('Unable to open file "' + sys.argv[1] + '"\n\n')
     usage()
 
 data = file.readlines()