X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tools%2Fthemeupdate%2Fthemeupdate.py;h=8454c1af6f3ce28bc0b984100922c2a6396dd569;hb=a72371b41f48a2d6a1e55099456d30d3b678b66c;hp=171be0b9595d3ea73f6bb37fd98f7fd3d2150a46;hpb=e68e6c6a536a2132570ddf1d1d3759bb31ef781e;p=chaz%2Fopenbox diff --git a/tools/themeupdate/themeupdate.py b/tools/themeupdate/themeupdate.py index 171be0b9..8454c1af 100755 --- a/tools/themeupdate/themeupdate.py +++ b/tools/themeupdate/themeupdate.py @@ -37,13 +37,13 @@ def find_key(data, keysubstr, exact = False): def simple_replace(data): pairs = {} - pairs['window.focus.font'] = 'window.label.focus.font' - pairs['window.unfocus.font'] = 'window.label.unfocus.font' - pairs['window.justify'] = 'window.label.justify' - pairs['menu.frame.disableColor'] = 'menu.disabled.textColor' + pairs['.picColor'] = '.imageColor' pairs['menu.frame'] = 'menu.items' pairs['menu.hilite'] = 'menu.selected' - pairs['.picColor'] = '.imageColor' + pairs['borderColor'] = 'border.color' + pairs['imageColor'] = 'image.color' + pairs['textColor'] = 'text.color' + pairs['interlaceColor'] = 'interlace.color' for k in pairs.keys(): while 1: @@ -56,6 +56,151 @@ def simple_replace(data): else: break + pairs = {} + pairs['window.focus.font'] = 'window.active.label.text.font' + pairs['window.unfocus.font'] = 'window.inactive.label.text.font' + pairs['window.justify'] = 'window.label.justify' + pairs['menu.frame.disableColor'] = 'menu.disabled.textColor' + pairs['window.label.focus.font'] = 'window.active.label.text.font' + pairs['window.label.unfocus.font'] = 'window.inactive.label.text.font' + pairs['window.label.justify'] = 'window.label.text.justify' + pairs['menu.title.font'] = 'menu.title.text.font' + pairs['menu.title.justify'] = 'menu.title.text.justify' + pairs['menuOverlap'] = 'menu.overlap' + pairs['handleWidth'] = 'window.handle.width' + pairs['borderWidth'] = 'border.width' + pairs['bevelWidth'] = 'padding.width' + pairs['frameWidth'] = 'window.client.padding.width' + pairs['window.frame.focusColor'] = 'window.active.client.color' + pairs['window.frame.unfocusColor'] = 'window.inactive.client.color' + pairs['window.title.focus'] = 'window.active.title.bg' + pairs['window.title.unfocus'] = 'window.inactive.title.bg' + pairs['window.label.focus'] = 'window.active.label.bg' + pairs['window.label.unfocus'] = 'window.inactive.label.bg' + pairs['window.handle.focus'] = 'window.active.handle.bg' + pairs['window.handle.unfocus'] = 'window.inactive.handle.bg' + pairs['window.grip.focus'] = 'window.active.grip.bg' + pairs['window.grip.unfocus'] = 'window.inactive.grip.bg' + pairs['menu.items'] = 'menu.items.bg' + pairs['menu.title'] = 'menu.title.bg' + pairs['menu.selected'] = 'menu.items.active.bg' + pairs['window.title.focus'] = 'window.active.title.bg' + pairs['window.label.focus'] = 'window.active.label.bg' + pairs['window.title.unfocus'] = 'window.inactive.title.bg' + pairs['window.label.unfocus'] = 'window.inactive.label.bg' + pairs['window.button.disabled.focus'] = 'window.active.button.disabled.bg' + pairs['window.button.disabled.unfocus'] = \ + 'window.inactive.button.disabled.bg' + pairs['window.button.pressed.focus'] = 'window.active.button.pressed.bg' + pairs['window.button.pressed.unfocus'] = \ + 'window.inactive.button.pressed.bg' + pairs['window.button.toggled.focus'] = 'window.active.button.toggled.bg' + pairs['window.button.toggled.unfocus'] = \ + 'window.inactive.button.toggled.bg' + pairs['window.button.focus'] = 'window.active.button.unpressed.bg' + pairs['window.button.unfocus'] = 'window.inactive.button.unpressed.bg' + pairs['window.button.hover.focus'] = 'window.active.button.hover.bg' + pairs['window.button.hover.unfocus'] = 'window.inactive.button.hover.bg' + + for k in pairs.keys(): + while 1: + i, key, nul = find_key(data, k, True); + if i >= 0: + newl = data[i].replace(k, pairs[k]) + out('Updating "' + key + + '" to "' + key.replace(k, pairs[k]) + '"\n') + data[i] = newl + else: + break + + pairs = {} + pairs['window.title.focus'] = 'window.active.title' + pairs['window.title.unfocus'] = 'window.inactive.title' + pairs['window.label.focus'] = 'window.active.label' + pairs['window.label.unfocus'] = 'window.inactive.label' + pairs['window.handle.focus'] = 'window.active.handle' + pairs['window.handle.unfocus'] = 'window.inactive.handle' + pairs['window.grip.focus'] = 'window.active.grip' + pairs['window.grip.unfocus'] = 'window.inactive.grip' + pairs['menu.selected'] = 'menu.items.active' + pairs['window.title.focus'] = 'window.active.title' + pairs['window.label.focus'] = 'window.active.label' + pairs['window.title.unfocus'] = 'window.inactive.title' + pairs['window.label.unfocus'] = 'window.inactive.label' + pairs['window.button.disabled.focus'] = 'window.active.button.disabled' + pairs['window.button.disabled.unfocus'] = \ + 'window.inactive.button.disabled' + pairs['window.button.pressed.focus'] = 'window.active.button.pressed' + pairs['window.button.pressed.unfocus'] = \ + 'window.inactive.button.pressed' + pairs['window.button.toggled.focus'] = 'window.active.button.toggled' + pairs['window.button.toggled.unfocus'] = \ + 'window.inactive.button.toggled' + pairs['window.button.focus'] = 'window.active.button' + pairs['window.button.unfocus'] = 'window.inactive.button' + pairs['window.button.hover.focus'] = 'window.active.button.hover' + pairs['window.button.hover.unfocus'] = 'window.inactive.button.hover' + pairs['window.label.unfocus'] = 'window.inactive.label' + pairs['window.label.focus'] = 'window.active.label' + pairs['window.button.focus'] = 'window.active.button.unpressed' + pairs['menu.disabled'] = 'menu.items.disabled' + pairs['menu.selected'] = 'menu.items.active' + pairs['window.button.unfocus'] = 'window.inactive.button.unpressed' + pairs['window.button.pressed.focus'] = 'window.active.button.pressed' + pairs['window.button.pressed.unfocus'] = 'window.inactive.button.pressed' + pairs['window.button.disabled.focus'] = 'window.active.button.disabled' + pairs['window.button.disabled.unfocus'] = 'window.inactive.button.disabled' + pairs['window.button.hover.focus'] = 'window.active.button.hover' + pairs['window.button.hover.unfocus'] = 'window.inactive.button.hover' + pairs['window.button.toggled.focus'] = 'window.active.button.toggled' + pairs['window.button.toggled.unfocus'] = 'window.inactive.button.toggled' + + for k in pairs.keys(): + while 1: + i, key, nul = find_key(data, k); + if i >= 0: + newl = data[i].replace(k, pairs[k]) + out('Updating "' + key + + '" to "' + key.replace(k, pairs[k]) + '"\n') + data[i] = newl + else: + break + +def replace_colors(data): + i = 0 + n = len(data) + while i < n: + l = data[i] + key, value = getkeyval(l) + if key and value: + if key.find('.color') != -1: + if key.find('client.color') == -1 \ + and key.find('image.color') == -1 \ + and key.find('bg.color') == -1 \ + and key.find('border.color') == -1 \ + and key.find('interlace.color') == -1 \ + and key.find('text.color') == -1: + newl = data[i].replace('.color', '.bg.color') + out('Updating "' + key + + '" to "' + key.replace('.color', '.bg.color') + '"\n') + data[i] = newl + if key.find('.border.color') != -1 \ + and key.find('bg.border.color') == -1: + newl = data[i].replace('.border.color', '.bg.border.color') + out('Updating "' + key + + '" to "' + key.replace('.border.color', + '.bg.border.color') + '"\n') + data[i] = newl + if key.find('.interlace.color') != -1 \ + and key.find('bg.interlace.color') == -1: + newl = data[i].replace('.interlace.color', + '.bg.interlace.color') + out('Updating "' + key + + '" to "' + key.replace('.interlace.color', + '.bg.interlace.color') + '"\n') + data[i] = newl + i += 1 + def remove(data): invalid = [] invalid.append('toolbar') @@ -71,6 +216,8 @@ def remove(data): break invalid.append('rootCommand') invalid.append('menu.bullet') + invalid.append('menu.bullet.image.color') + invalid.append('menu.bullet.selected.image.color') invalid.append('menu.frame.justify') for inv in invalid: while 1: @@ -192,7 +339,7 @@ def pixelsize(data): def warn_missing(data): need = ('window.button.hover.focus', 'window.button.hover.unfocus', - 'menuOverlap') + 'menu.overlap') for n in need: i, nul, nul = find_key(data, n) if i < 0: @@ -200,8 +347,10 @@ def warn_missing(data): 'can optionally be set.\n') def err_missing(data): - need = ('window.button.disabled.focus', 'window.button.disabled.unfocus', - 'window.frame.focusColor', 'window.frame.unfocusColor') + need = ('window.active.button.disabled', + 'window.inactive.button.disabled', + 'window.active.client.color', + 'window.inactive.client.color') for n in need: i, nul, nul = find_key(data, n) if i < 0: @@ -228,6 +377,7 @@ for i in range(len(data)): data[i] = data[i].strip() simple_replace(data) +replace_colors(data) remove(data) pressed(data) x_fonts(data)