Commits May 2023

commits@lists.geany.org

1 participants
25 discussions

[geany/geany] 99b846: Merge pull request #3485 from eht16/port_main_py_template_to_python3
by Enrico Tröger 12 May '23

12 May '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Fri, 12 May 2023 21:02:50 UTC Commit: 99b846166a53182493467feec789b7fd6ccb73f5 https://github.com/geany/geany/commit/99b846166a53182493467feec789b7fd6ccb7… Log Message: ----------- Merge pull request #3485 from eht16/port_main_py_template_to_python3 Port "main.py" template to Python3 Modified Paths: -------------- data/templates/files/main.py Modified: data/templates/files/main.py 10 lines changed, 6 insertions(+), 4 deletions(-) =================================================================== @@ -1,11 +1,13 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 # {fileheader} +import sys + + def main(args): return 0 + if __name__ == '__main__': - import sys - sys.exit(main(sys.argv)) + sys.exit(main(sys.argv[1:])) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 5918ed: Fix duplicate key in "retro" theme
by Enrico Tröger 12 May '23

12 May '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 10 May 2023 21:11:09 UTC Commit: 5918edd134491bffc66bf0d184322ea40f4a1078 https://github.com/geany/geany-themes/commit/5918edd134491bffc66bf0d184322e… Log Message: ----------- Fix duplicate key in "retro" theme Modified Paths: -------------- colorschemes/retro.conf Modified: colorschemes/retro.conf 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,6 @@ caret=#0c0;#000;true;true marker_line=default,italic marker_search=;#000 marker_mark=#0c0;#000 -fold_symbol_highlight=#000 call_tips=#000;#0c0;true;true white_space=#104e10;;true -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] d475e8: Fix mkindex.py to work with Python3 and regenerate index.json
by Enrico Tröger 12 May '23

12 May '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 10 May 2023 21:10:40 UTC Commit: d475e844c970c0cd82367027e7785a74a0e2f1a9 https://github.com/geany/geany-themes/commit/d475e844c970c0cd82367027e7785a… Log Message: ----------- Fix mkindex.py to work with Python3 and regenerate index.json The script still needs to be fully ported to Python3, for now it just works to some extend. Modified Paths: -------------- index/index.json index/index.json.md5 scripts/mkindex.py Modified: index/index.json 692 lines changed, 692 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: index/index.json.md5 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -d41d8cd98f00b204e9800998ecf8427e index.json +771e479597a38d87b01b17441ccf3eb3 index.json Modified: scripts/mkindex.py 26 lines changed, 15 insertions(+), 11 deletions(-) =================================================================== @@ -5,22 +5,26 @@ Note: requires Python Imaging Library (PIL), ex. 'python-imaging' Debian package. ''' +# TODO this script needs to be ported to Python 3 properly + import os import sys import json -from configparser import ConfigParser +from configparser import ConfigParser, Error as ConfigParserError import hashlib import base64 -import StringIO +from io import BytesIO, StringIO from PIL import Image, ImageDraw, ImageOps, ImageFilter THUMBNAIL_SIZE = (128, 128) SCREENSHOT_BASE = 'https://raw.github.com/geany/geany-themes/master/screenshots/' SCHEMES_BASE = 'https://raw.github.com/geany/geany-themes/master/colorschemes/' def get_option(cp, group, key, default=None): - try: return cp.get(group, key) - except ConfigParser.Error: return default + try: + return cp.get(group, key) + except ConfigParserError: + return default def generate_thumbnail(conf_fn, screenshot_dir='screenshots'): base = os.path.splitext(os.path.basename(conf_fn))[0] @@ -29,11 +33,11 @@ def generate_thumbnail(conf_fn, screenshot_dir='screenshots'): if not os.path.exists(png_file): png_file = os.path.join(screenshot_dir, 'screenshot-missing.png') img = Image.open(png_file) - output = StringIO.StringIO() + output = BytesIO() img.save(output, "PNG", optimize=True) data = base64.b64encode(output.getvalue()) output.close() - return data + return data.decode() else: img = Image.open(png_file) img = img.crop((2,2,img.size[1]-2,img.size[1]-2)) @@ -49,12 +53,12 @@ def generate_thumbnail(conf_fn, screenshot_dir='screenshots'): thumb_fn = os.path.join(thumb_dir, base + '.png') img.save(thumb_fn, "PNG", optimize=True) #-- - output = StringIO.StringIO() + output = BytesIO() img.save(output, "PNG", optimize=True) data = base64.b64encode(output.getvalue()) output.close() - return data + return data.decode() def create_index(themes_dir, screenshot_dir='screenshots'): data = {} @@ -65,7 +69,7 @@ def create_index(themes_dir, screenshot_dir='screenshots'): continue conf_file = os.path.join(themes_dir, conf_file) - cp = ConfigParser.ConfigParser() + cp = ConfigParser() cp.read(conf_file) if not cp.has_section('theme_info'): @@ -80,7 +84,7 @@ def create_index(themes_dir, screenshot_dir='screenshots'): png_file = os.path.join(screenshot_dir, scheme_name + '.png') if os.path.isfile(png_file): - png_hash = hashlib.md5(open(png_file).read()).hexdigest() + png_hash = hashlib.md5(open(png_file, 'rb').read()).hexdigest() else: png_hash = '' @@ -100,7 +104,7 @@ def create_index(themes_dir, screenshot_dir='screenshots'): 'colorscheme': '%s%s.conf' % (SCHEMES_BASE, scheme_name), 'thumbnail': generate_thumbnail(conf_file, screenshot_dir), 'screen_hash': png_hash, - 'scheme_hash': hashlib.md5(open(conf_file).read()).hexdigest(), + 'scheme_hash': hashlib.md5(open(conf_file, 'rb').read()).hexdigest(), 'compat': versions, } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 10c964: Fix screenshot filename for "kary-pro-colors-light" theme
by Enrico Tröger 12 May '23

12 May '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 10 May 2023 21:11:36 UTC Commit: 10c964d19e12caa99148ce8fcb89d1a8c3af840d https://github.com/geany/geany-themes/commit/10c964d19e12caa99148ce8fcb89d1… Log Message: ----------- Fix screenshot filename for "kary-pro-colors-light" theme Modified Paths: -------------- screenshots/kary-pro-colors-light.png Modified: screenshots/kary-pro-colors-light.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 35af25: Merge pull request #58 from eht16/fix_broken_theme_index
by Dominic Hopf 12 May '23

12 May '23

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 12 May 2023 07:23:54 UTC Commit: 35af25e650d15704d327f1f01726c248ec652a05 https://github.com/geany/geany-themes/commit/35af25e650d15704d327f1f01726c2… Log Message: ----------- Merge pull request #58 from eht16/fix_broken_theme_index Fix broken theme index Modified Paths: -------------- colorschemes/retro.conf index/index.json index/index.json.md5 screenshots/kary-pro-colors-light.png scripts/mkindex.py Modified: colorschemes/retro.conf 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,6 @@ caret=#0c0;#000;true;true marker_line=default,italic marker_search=;#000 marker_mark=#0c0;#000 -fold_symbol_highlight=#000 call_tips=#000;#0c0;true;true white_space=#104e10;;true Modified: index/index.json 692 lines changed, 692 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: index/index.json.md5 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -d41d8cd98f00b204e9800998ecf8427e index.json +771e479597a38d87b01b17441ccf3eb3 index.json Modified: screenshots/kary-pro-colors-light.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: scripts/mkindex.py 26 lines changed, 15 insertions(+), 11 deletions(-) =================================================================== @@ -5,22 +5,26 @@ Note: requires Python Imaging Library (PIL), ex. 'python-imaging' Debian package. ''' +# TODO this script needs to be ported to Python 3 properly + import os import sys import json -from configparser import ConfigParser +from configparser import ConfigParser, Error as ConfigParserError import hashlib import base64 -import StringIO +from io import BytesIO, StringIO from PIL import Image, ImageDraw, ImageOps, ImageFilter THUMBNAIL_SIZE = (128, 128) SCREENSHOT_BASE = 'https://raw.github.com/geany/geany-themes/master/screenshots/' SCHEMES_BASE = 'https://raw.github.com/geany/geany-themes/master/colorschemes/' def get_option(cp, group, key, default=None): - try: return cp.get(group, key) - except ConfigParser.Error: return default + try: + return cp.get(group, key) + except ConfigParserError: + return default def generate_thumbnail(conf_fn, screenshot_dir='screenshots'): base = os.path.splitext(os.path.basename(conf_fn))[0] @@ -29,11 +33,11 @@ def generate_thumbnail(conf_fn, screenshot_dir='screenshots'): if not os.path.exists(png_file): png_file = os.path.join(screenshot_dir, 'screenshot-missing.png') img = Image.open(png_file) - output = StringIO.StringIO() + output = BytesIO() img.save(output, "PNG", optimize=True) data = base64.b64encode(output.getvalue()) output.close() - return data + return data.decode() else: img = Image.open(png_file) img = img.crop((2,2,img.size[1]-2,img.size[1]-2)) @@ -49,12 +53,12 @@ def generate_thumbnail(conf_fn, screenshot_dir='screenshots'): thumb_fn = os.path.join(thumb_dir, base + '.png') img.save(thumb_fn, "PNG", optimize=True) #-- - output = StringIO.StringIO() + output = BytesIO() img.save(output, "PNG", optimize=True) data = base64.b64encode(output.getvalue()) output.close() - return data + return data.decode() def create_index(themes_dir, screenshot_dir='screenshots'): data = {} @@ -65,7 +69,7 @@ def create_index(themes_dir, screenshot_dir='screenshots'): continue conf_file = os.path.join(themes_dir, conf_file) - cp = ConfigParser.ConfigParser() + cp = ConfigParser() cp.read(conf_file) if not cp.has_section('theme_info'): @@ -80,7 +84,7 @@ def create_index(themes_dir, screenshot_dir='screenshots'): png_file = os.path.join(screenshot_dir, scheme_name + '.png') if os.path.isfile(png_file): - png_hash = hashlib.md5(open(png_file).read()).hexdigest() + png_hash = hashlib.md5(open(png_file, 'rb').read()).hexdigest() else: png_hash = '' @@ -100,7 +104,7 @@ def create_index(themes_dir, screenshot_dir='screenshots'): 'colorscheme': '%s%s.conf' % (SCHEMES_BASE, scheme_name), 'thumbnail': generate_thumbnail(conf_file, screenshot_dir), 'screen_hash': png_hash, - 'scheme_hash': hashlib.md5(open(conf_file).read()).hexdigest(), + 'scheme_hash': hashlib.md5(open(conf_file, 'rb').read()).hexdigest(), 'compat': versions, } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 35d4f1: Merge pull request #57 from StrayFeral/evg-ega-dark
by Dominic Hopf 10 May '23

10 May '23

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 10 May 2023 06:01:28 UTC Commit: 35d4f1b8398760f61c0e1cba78d6d84c74ece67c https://github.com/geany/geany-themes/commit/35d4f1b8398760f61c0e1cba78d6d8… Log Message: ----------- Merge pull request #57 from StrayFeral/evg-ega-dark Added new color theme evg-ega-dark, fixed mkindex.py Modified Paths: -------------- colorschemes/evg-ega-dark.conf index/index.json index/index.json.md5 screenshots/evg-ega-dark.png scripts/mkindex.py Modified: colorschemes/evg-ega-dark.conf 148 lines changed, 148 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,148 @@ +# Geany color theme +# 2023 by Evgueni Antonov <Evgueni(dot)Antonov(at)gmail(dot)com> +# +# Created on Geany 1.38 (on lubuntu). +# I created this theme specifically for Python, so this is how it was tested. +# I can't guarantee how it will work and appear on previous Geany versions. +# +# PUBLIC DOMAIN +# +# Inspired by vim and the DOS era (the EGA color palette). Initially I wanted to use +# 100% the EGA color palette, but then decided to darken some of the colors. Then +# noticed how I like my vim theme, so I made a mix of them all. +# + + +[theme_info] +name=Evg-EGA-Dark +description=A dark theme inspired by vim, DOS and EGA +# incremented automatically, do not change manually +version=1225 +author=Evgueni Antonov <Evgueni(dot)Antonov(at)gmail(dot)com> +url=https://github.com/StrayFeral/geany_tools/ + + +[named_colors] +# DOS colors +dos_grey=#9c9c9c + +# EGA palette +white=#ffffff +black=#000000 +ega_blue=#0000aa +ega_green=#00aa00 +ega_cyan=#00aaaa +ega_red=#aa0000 +ega_magenta=#aa00aa +ega_brown=#aa5500 +ega_light_grey=#aaaaaa +ega_dark_grey=#555555 +ega_bright_blue=#5555ff +ega_bright_green=#55ff55 +ega_bright_cyan=#55ffff +ega_bright_red=#ff5555 +ega_bright_magenta=#ff55ff +ega_bright_yellow=#ffff55 + +darker_blue=#000088 +darker_white=#e0e0e0 +darker_yellow=#cccc55 +darker_cyan=#005050 +fruity_dark_red=#aa88aa + +# Misc +background_color=#000000 +text_color=#00aaaa +current_line_background_color=#202020 +selection_background_color=#383838 +margin_line_number_background_color=#202020 + + +[named_styles] +default=dos_grey;background_color;false;false +error=ega_bright_red;background_color;false;false + +# Editor styles +#------------------------------------------------------------------------------- + +selection=dos_grey;selection_background_color;false;true +current_line=dos_grey;current_line_background_color;true;false +brace_good=white;ega_cyan;true;true +brace_bad=ega_bright_yellow;ega_red;true;true +margin_line_number=dos_grey;margin_line_number_background_color;false;false +margin_folding=dos_grey +fold_symbol_highlight=ega_blue +indent_guide=ega_blue +caret=white;white;false +marker_line=ega_blue;ega_brown +marker_search=ega_cyan;ega_cyan;false;false +marker_mark=ega_bright_magenta +call_tips=dos_grey;white;false;false +white_space=ega_bright_blue;;true + +# Programming languages +#------------------------------------------------------------------------------- + +comment=ega_dark_grey;background_color;true;true +comment_doc=ega_dark_grey;background_color;false;false +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment_doc +comment_doc_keyword_error=comment_doc + +number=ega_bright_magenta +number_1=number +number_2=number_1 + +type=ega_bright_cyan;;true;false +class=type +function=type +parameter=function + +keyword=darker_yellow +keyword_1=keyword +keyword_2=ega_bright_cyan +keyword_3=keyword +keyword_4=keyword + +identifier=default +identifier_1=dos_grey +identifier_2=identifier +identifier_3=identifier +identifier_4=identifier + +string=ega_green +string_1=string +string_2=string_1 +string_3=string_1 +string_4=string_1 +string_eol=text_color +character=string_1 +backticks=string_2 +here_doc=ega_dark_grey + +scalar=string_2 +label=white +preprocessor=text_color +regex=number_1 +operator=white +decorator=ega_brown +other=default + +# Markup-type languages +#------------------------------------------------------------------------------- + +tag=ega_bright_yellow +tag_unknown=ega_bright_red +tag_end=text_color +attribute=ega_brown +attribute_unknown=ega_bright_red +value=white +entity=white + +# Diff +#------------------------------------------------------------------------------- + +line_added=ega_bright_green +line_removed=ega_red +line_changed=ega_bright_blue Modified: index/index.json 585 lines changed, 0 insertions(+), 585 deletions(-) =================================================================== No diff available, check online Modified: index/index.json.md5 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -e6e64ddd4cb07ac51829e8385e235f01 index.json +d41d8cd98f00b204e9800998ecf8427e index.json Modified: screenshots/evg-ega-dark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: scripts/mkindex.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,7 @@ import os import sys import json -import ConfigParser +from configparser import ConfigParser import hashlib import base64 import StringIO -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 0c0a8c: Ran 'make index' as per requirements to update meta data for new color theme. However also fixed mkindex.py to work with Python 3.10
by Evgueni Antonov 10 May '23

10 May '23

Branch: refs/heads/master Author: Evgueni Antonov <strayferalmusic(a)gmail.com> Committer: Evgueni Antonov <strayferalmusic(a)gmail.com> Date: Wed, 10 May 2023 00:24:20 UTC Commit: 0c0a8c28bcd3479e472f6125f3362c679cfc895b https://github.com/geany/geany-themes/commit/0c0a8c28bcd3479e472f6125f3362c… Log Message: ----------- Ran 'make index' as per requirements to update meta data for new color theme. However also fixed mkindex.py to work with Python 3.10 Modified Paths: -------------- index/index.json index/index.json.md5 scripts/mkindex.py Modified: index/index.json 585 lines changed, 0 insertions(+), 585 deletions(-) =================================================================== No diff available, check online Modified: index/index.json.md5 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -e6e64ddd4cb07ac51829e8385e235f01 index.json +d41d8cd98f00b204e9800998ecf8427e index.json Modified: scripts/mkindex.py 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -8,7 +8,7 @@ import os import sys import json -import ConfigParser +from configparser import ConfigParser import hashlib import base64 import StringIO -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 838416: Added new color theme evg-ega-dark, tested as per the Geany maintainers requirements.
by Evgueni Antonov 10 May '23

10 May '23

Branch: refs/heads/master Author: Evgueni Antonov <strayferalmusic(a)gmail.com> Committer: Evgueni Antonov <strayferalmusic(a)gmail.com> Date: Wed, 10 May 2023 00:05:20 UTC Commit: 838416c965c8243af6a3cb3673a9d8ce434d212e https://github.com/geany/geany-themes/commit/838416c965c8243af6a3cb3673a9d8… Log Message: ----------- Added new color theme evg-ega-dark, tested as per the Geany maintainers requirements. Modified Paths: -------------- colorschemes/evg-ega-dark.conf screenshots/evg-ega-dark.png Modified: colorschemes/evg-ega-dark.conf 148 lines changed, 148 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,148 @@ +# Geany color theme +# 2023 by Evgueni Antonov <Evgueni(dot)Antonov(at)gmail(dot)com> +# +# Created on Geany 1.38 (on lubuntu). +# I created this theme specifically for Python, so this is how it was tested. +# I can't guarantee how it will work and appear on previous Geany versions. +# +# PUBLIC DOMAIN +# +# Inspired by vim and the DOS era (the EGA color palette). Initially I wanted to use +# 100% the EGA color palette, but then decided to darken some of the colors. Then +# noticed how I like my vim theme, so I made a mix of them all. +# + + +[theme_info] +name=Evg-EGA-Dark +description=A dark theme inspired by vim, DOS and EGA +# incremented automatically, do not change manually +version=1225 +author=Evgueni Antonov <Evgueni(dot)Antonov(at)gmail(dot)com> +url=https://github.com/StrayFeral/geany_tools/ + + +[named_colors] +# DOS colors +dos_grey=#9c9c9c + +# EGA palette +white=#ffffff +black=#000000 +ega_blue=#0000aa +ega_green=#00aa00 +ega_cyan=#00aaaa +ega_red=#aa0000 +ega_magenta=#aa00aa +ega_brown=#aa5500 +ega_light_grey=#aaaaaa +ega_dark_grey=#555555 +ega_bright_blue=#5555ff +ega_bright_green=#55ff55 +ega_bright_cyan=#55ffff +ega_bright_red=#ff5555 +ega_bright_magenta=#ff55ff +ega_bright_yellow=#ffff55 + +darker_blue=#000088 +darker_white=#e0e0e0 +darker_yellow=#cccc55 +darker_cyan=#005050 +fruity_dark_red=#aa88aa + +# Misc +background_color=#000000 +text_color=#00aaaa +current_line_background_color=#202020 +selection_background_color=#383838 +margin_line_number_background_color=#202020 + + +[named_styles] +default=dos_grey;background_color;false;false +error=ega_bright_red;background_color;false;false + +# Editor styles +#------------------------------------------------------------------------------- + +selection=dos_grey;selection_background_color;false;true +current_line=dos_grey;current_line_background_color;true;false +brace_good=white;ega_cyan;true;true +brace_bad=ega_bright_yellow;ega_red;true;true +margin_line_number=dos_grey;margin_line_number_background_color;false;false +margin_folding=dos_grey +fold_symbol_highlight=ega_blue +indent_guide=ega_blue +caret=white;white;false +marker_line=ega_blue;ega_brown +marker_search=ega_cyan;ega_cyan;false;false +marker_mark=ega_bright_magenta +call_tips=dos_grey;white;false;false +white_space=ega_bright_blue;;true + +# Programming languages +#------------------------------------------------------------------------------- + +comment=ega_dark_grey;background_color;true;true +comment_doc=ega_dark_grey;background_color;false;false +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment_doc +comment_doc_keyword_error=comment_doc + +number=ega_bright_magenta +number_1=number +number_2=number_1 + +type=ega_bright_cyan;;true;false +class=type +function=type +parameter=function + +keyword=darker_yellow +keyword_1=keyword +keyword_2=ega_bright_cyan +keyword_3=keyword +keyword_4=keyword + +identifier=default +identifier_1=dos_grey +identifier_2=identifier +identifier_3=identifier +identifier_4=identifier + +string=ega_green +string_1=string +string_2=string_1 +string_3=string_1 +string_4=string_1 +string_eol=text_color +character=string_1 +backticks=string_2 +here_doc=ega_dark_grey + +scalar=string_2 +label=white +preprocessor=text_color +regex=number_1 +operator=white +decorator=ega_brown +other=default + +# Markup-type languages +#------------------------------------------------------------------------------- + +tag=ega_bright_yellow +tag_unknown=ega_bright_red +tag_end=text_color +attribute=ega_brown +attribute_unknown=ega_bright_red +value=white +entity=white + +# Diff +#------------------------------------------------------------------------------- + +line_added=ega_bright_green +line_removed=ega_red +line_changed=ega_bright_blue Modified: screenshots/evg-ega-dark.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 546659: Make Go to Symbol commands show signature list (#3475)
by Nick Treleaven 08 May '23

08 May '23

Branch: refs/heads/master Author: Nick Treleaven <ntrel002(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Mon, 08 May 2023 11:44:00 UTC Commit: 54665998383eb03c5565aa360ff56ed4f7792aa6 https://github.com/geany/geany/commit/54665998383eb03c5565aa360ff56ed4f7792… Log Message: ----------- Make Go to Symbol commands show signature list (#3475) When there is more than one matching symbol. For variables, show type. For callables, show (at least) parameter list. Show non-first item using italic `file:line:`. Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 9 lines changed, 7 insertions(+), 2 deletions(-) =================================================================== @@ -536,6 +536,7 @@ static const gchar *get_symbol_name(GeanyDocument *doc, const TMTag *tag, gboole } +// Returns NULL if the tag is not a variable or callable static gchar *get_symbol_tooltip(GeanyDocument *doc, const TMTag *tag) { gchar *utf8_name = tm_parser_format_function(tag->lang, tag->name, @@ -1508,14 +1509,18 @@ static void show_goto_popup(GeanyDocument *doc, GPtrArray *tags, gboolean have_b GtkWidget *image; gchar *fname = short_names[i]; gchar *text; + gchar *sym = get_symbol_tooltip(doc, tmtag); + if (!sym) + sym = g_strdup(""); if (! first && have_best) /* For translators: it's the filename and line number of a symbol in the goto-symbol popup menu */ - text = g_markup_printf_escaped(_("%s: %lu"), fname, tmtag->line); + text = g_markup_printf_escaped(_("%s:%lu: %s"), fname, tmtag->line, sym); else /* For translators: it's the filename and line number of a symbol in the goto-symbol popup menu */ - text = g_markup_printf_escaped(_("%s: %lu"), fname, tmtag->line); + text = g_markup_printf_escaped(_("%s:%lu: %s"), fname, tmtag->line, sym); + g_free(sym); image = gtk_image_new_from_pixbuf(symbols_icons[get_tag_class(tmtag)].pixbuf); label = g_object_new(GTK_TYPE_LABEL, "label", text, "use-markup", TRUE, "xalign", 0.0, NULL); item = g_object_new(GTK_TYPE_IMAGE_MENU_ITEM, "image", image, "child", label, "always-show-image", TRUE, NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] bf1560: Remove upstream-merged vimode patches
by Jiří Techet 07 May '23

07 May '23

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 May 2023 20:56:45 UTC Commit: bf15605b8fd8242d8029deef0607479525b1d7c3 https://github.com/geany/geany-osx/commit/bf15605b8fd8242d8029deef060747952… Log Message: ----------- Remove upstream-merged vimode patches Modified Paths: -------------- geany.modules Modified: geany.modules 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -166,10 +166,6 @@ <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_plugins_g…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_plugins_g…" strip="1" />  - <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_plugins_v…" strip="1" /> - <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_plugins_v…" strip="1" /> - <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_plugins_v…" strip="1" /> - <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_plugins_v…" strip="1" /> <patch file="https://github.com/geany/geany-osx/raw/master/geany_patches/geany_plugins_g…" strip="1" /> </branch> <dependencies> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2023