Branch: refs/heads/master Author: Matthew Brush mbrush@codebrainz.ca Committer: Matthew Brush mbrush@codebrainz.ca Date: Tue, 18 Jun 2013 10:31:17 UTC Commit: ef70c41dc0f373de04d8371962703bf4f1caf871 https://github.com/geany/geany-themes/commit/ef70c41dc0f373de04d8371962703bf...
Log Message: ----------- Switch version number scheme used in themes
From now on the version field in color scheme files is a simple
integer incremented each time the scheme is changed. To avoid arbitrarily re-setting all versions to 0 (or some other number), I just removed the decimal point from the existing versions so they still have some significance.
* Update mkindex.py to handle new format * Remove deleted note from index/README.md * Update index/index.json and MD5 sum of it
Modified Paths: -------------- colorschemes/bespin.conf colorschemes/black.conf colorschemes/dark-fruit-salad.conf colorschemes/dark.conf colorschemes/fluffy.conf colorschemes/gedit.conf colorschemes/github.conf colorschemes/inkpot.conf colorschemes/kugel.conf colorschemes/mc.conf colorschemes/monokai.conf colorschemes/oblivion2.conf colorschemes/pygments.conf colorschemes/railcasts2.conf colorschemes/retro.conf colorschemes/slushpoppies.conf colorschemes/solarized-dark.conf colorschemes/solarized-light.conf colorschemes/tango-dark.conf colorschemes/tango-light.conf colorschemes/tinge.conf colorschemes/vibrant-ink.conf colorschemes/zenburn.conf index/README.md index/index.json index/index.json.md5 scripts/mkindex.py
Modified: colorschemes/bespin.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,8 @@ [theme_info] name=Bespin description=A port of the Bespin theme. -version=1.22.0 +# increment after changing scheme +version=1220 author=Alexandre da Silva (tm2gtksw2) url=https://github.com/gmate/gmate/blob/master/styles/Bespin.xml
Modified: colorschemes/black.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -26,7 +26,8 @@ [theme_info] name=Black Scheme description=Black background, other colours -version=1.23.1 +# increment after changing scheme +version=1231 author=Paul Lenton <lentonp(at)gmail(dot)com>
Modified: colorschemes/dark-fruit-salad.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,8 @@ [theme_info] name=Dark Fruit Salad description=Low contrast theme ported from the set_geany_colors utility -version=1.22.0 +# increment after changing scheme +version=1220 author=John Gabriele <jmg3000(at)gmail(dot)com> url=https://github.com/codebrainz/geany-themes
Modified: colorschemes/dark.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -22,7 +22,8 @@ [theme_info] name=Dark description=Dark syntax colouring theme -version=1.22.0 +# increment after changing scheme +version=1220 author=Duncan Lock <duncan.lock(at)gmail(dot)com> url=http://code.google.com/p/geany-dark-scheme/
Modified: colorschemes/fluffy.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -14,7 +14,8 @@ [theme_info] name=Fluffy description=A soft and downy color scheme. -version=1.22.0 +# increment after changing scheme +version=1220 author=Osmo Salomaa <unknown email address> url=https://github.com/mig/gedit-themes/blob/master/fluffy.xml
Modified: colorschemes/gedit.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -21,7 +21,8 @@ [theme_info] name=Gedit description=A port of Gedit's default theme. -version=1.22.0 +# increment after changing scheme +version=1220 author=Yevgen Muntyan <muntyan(at)tamu(dot)edu> url=http://git.gnome.org/browse/gtksourceview/tree/data/styles/classic.xml
Modified: colorschemes/github.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -22,7 +22,8 @@ [theme_info] name=GitHub description=Similar to GitHub.com's highlighting colors. -version=1.22.0 +# increment after changing scheme +version=1220 author=Felipe Mesquita <fmesquitacunha(at)gmail(dot)com> url=https://github.com/mig/gedit-themes/blob/master/github.xml
Modified: colorschemes/inkpot.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -20,7 +20,8 @@ [theme_info] name=InkPot description=Based on the vim theme of the same name. -version=1.22.0 +# increment after changing scheme +version=1220 author=Campbell Barton <ideasman42(at)gmail(dot)com> url=https://github.com/codebrainz/geany-themes
Modified: colorschemes/kugel.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,8 @@ [theme_info] name=Kugel description=A dark, but not too dark with focus to be comfortable to the eyes. -version=1.22.0 +# increment after changing scheme +version=1220 author=Thomas Martitz thomas.martitz@student.htw-berlin.de url=https://github.com/codebrainz/geany-themes
Modified: colorschemes/mc.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -20,7 +20,8 @@ [theme_info] name=Ralesk's MC description=Midnight Commander-like scheme -version=1.22.1 +# increment after changing scheme +version=1221 author=Henrik Pauli ralesk@drangolin.net url=http://share.drangolin.net/mc.conf
Modified: colorschemes/monokai.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -9,7 +9,8 @@ [theme_info] name=Monokai description=It's warm, colorful and pleasing to the eyes -version=1.0 +# increment after changing scheme +version=10 author=Wimer Hazenberg url=http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
Modified: colorschemes/oblivion2.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -22,7 +22,8 @@ [theme_info] name=Oblivion 2 description=Based on the Gedit color scheme Oblivion and the Dark Color Scheme with rearranged colors. -version=1.22.0 +# increment after changing scheme +version=1220 author=Bernhard Posselt <bernhard.posselt(at)gmx(dot)at> url=http://download.geany.org/contrib/oblivion2.tar.gz
Modified: colorschemes/pygments.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,8 @@ [theme_info] name=Pygments description=Default Pygments theme for Geany -version=1.22.0 +# increment after changing scheme +version=1220 author=Pocoo url=http://pygments.org
Modified: colorschemes/railcasts2.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -9,7 +9,8 @@ [theme_info] name=Railcasts 2 description=A port of railscasts2 from gedit-themes. -version=1.22.0 +# increment after changing scheme +version=1220 author=Unknown Author <unknown email address> url=https://github.com/mig/gedit-themes/blob/master/railscasts2.xml
Modified: colorschemes/retro.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -20,7 +20,8 @@ [theme_info] name=Retro description=Inspired by old green screen terminals. -version=0.01 +# increment after changing scheme +version=1 author=Matthew Brush url=
Modified: colorschemes/slushpoppies.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -22,7 +22,8 @@ [theme_info] name=Slush and Poppies description=A port of Slush and Poppies from gedit-themes. -version=1.22.0 +# increment after changing scheme +version=1220 author=Will Farrington <wcfarrington(at)gmail(dot)com> url=https://github.com/mig/gedit-themes/blob/master/slush_and_poppies.xml
Modified: colorschemes/solarized-dark.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,8 @@ [theme_info] name=Solarized (dark) description=Dark Solarized theme for Geany -version=1.22.0 +# increment after changing scheme +version=1220 author=Ethan Schoonover url=http://ethanschoonover.com/solarized
Modified: colorschemes/solarized-light.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -27,7 +27,8 @@ [theme_info] name=Solarized (light) description=Light Solarized theme for Geany -version=1.22.0 +# increment after changing scheme +version=1220 author=Ethan Schoonover url=http://ethanschoonover.com/solarized
Modified: colorschemes/tango-dark.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -15,7 +15,8 @@ [theme_info] name=Tango description=Loosely based on the Dark theme, but Tangofied. -version=1.22.0 +# increment after changing scheme +version=1220 author=Barry van Oudtshoorn url=https://github.com/codebrainz/geany-themes/blob/master/tango-dark.conf
Modified: colorschemes/tango-light.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -20,7 +20,8 @@ [theme_info] name=Tango Light description=A light theme using Tango colors. -version=1.22.0 +# increment after changing scheme +version=1220 author=Colomban Wendling lists.ban@herbesfolles.org url=https://github.com/codebrainz/geany-themes/blob/master/tango-light.conf
Modified: colorschemes/tinge.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -28,7 +28,8 @@ [theme_info] name=Tinge description=A tinge more tanginess -version=1.22.0 +# increment after changing scheme +version=1220 author=Harsh J <harshj(at)gmail(dot)com> # alt url: # http://www.harshj.com/2008/01/27/tinge-theme-for-gedit/
Modified: colorschemes/vibrant-ink.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -25,7 +25,8 @@ [theme_info] name=Vibrant description=Vibrant Ink Theme for Geany -version=1.22.0 +# increment after changing scheme +version=1220 author=Jason Wilson <jason.willson(at)gmail(dot)com> url=http://code.google.com/p/geany-vibrant-ink-theme
Modified: colorschemes/zenburn.conf 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -9,7 +9,8 @@ [theme_info] name=Zenburn description=A port of Zenburn from gedit-themes. -version=1.22.0 +# increment after changing scheme +version=1220 author=Unknown Author <unknown email address> url=https://github.com/mig/gedit-themes/blob/master/zenburn.xml
Modified: index/README.md 9 files changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -69,12 +69,3 @@ icon that is 64 pixels wide and tall. This field contains a whole number that is incremented each time the theme is changed. You can compare this against installed color scheme versions to see if an update is available. - -<s>The version number is a sequence of one or more digits, optionally -separated by periods/decimal points. The string will always contain -only 0-9 and optional decimal points in between any of the numbers, -for example "1.2.3", "123", "12.3", but never "..2", ".2.", "....", etc. -The result of splitting the string on the decimal point and converting -each component into an integer will always succeed and the string will -never be empty. One or more of the numbers in the string will move in -the upward direction when the colour scheme is modified.</s>
Modified: index/index.json 92 files changed, 46 insertions(+), 46 deletions(-) =================================================================== No diff available, check online
Modified: index/index.json.md5 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -909a1c759ba0bc8ea2181dc856c4c269 index.json +d9f3cb5f0252d4b1664c3aa2dd010ca9 index.json
Modified: scripts/mkindex.py 9 files changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -73,15 +73,14 @@ def create_index(themes_dir, screenshot_dir='screenshots'): scheme_name = '.'.join(os.path.basename(conf_file).split('.')[:-1])
try: - version = get_option(cp, 'theme_info', 'version', '0.0.0').split('.') - version = list(version + (['0']*3))[0:3] - except IndexError, TypeError: - version = ['0']*3 + version = int(get_option(cp, 'theme_info', 'version', '0')) + except: + version = '0'
data[scheme_name] = { 'name': get_option(cp, 'theme_info', 'name', 'Untitled'), 'description': get_option(cp, 'theme_info', 'description', ''), - 'version': '.'.join(version), + 'version': version, 'author': get_option(cp, 'theme_info', 'author', 'Unknown Author'), 'screenshot': '%s%s.png' % (SCREENSHOT_BASE, scheme_name), 'colorscheme': '%s%s.conf' % (SCHEMES_BASE, scheme_name),
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).