Skip to content

bpo-34548: IDLE: use configured theme colors in TextView #9008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 6 commits into from
Sep 23, 2018
Merged

bpo-34548: IDLE: use configured theme colors in TextView #9008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1256c49
bpo-34548: IDLE: Make TextView use the configured theme colors
taleinat Aug 30, 2018
68d6454
bpo-34548: add a NEWS entry
taleinat Sep 22, 2018
6d825ef
Merge remote-tracking branch 'origin/master' into pr_9008
terryjreedy Sep 23, 2018
92f39d3
Minor changes to colorizer, textview, and blurb.
terryjreedy Sep 23, 2018
e86927c
Tweak color_config docstring.
terryjreedy Sep 23, 2018
9b2831c
Update 2018-09-22-20-25-07.bpo-34548.7pBzjg.rst
taleinat Sep 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Lib/idlelib/colorizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ def make_pat():
prog = re.compile(make_pat(), re.S)
idprog = re.compile(r"\s+(\w+)", re.S)

def color_config(text): # Called from htest, Editor, and Turtle Demo.
'''Set color opitons of Text widget.
def color_config(text):
"""Set color options of Text widget.

Should be called whenever ColorDelegator is called.
'''
If ColorDelegator is used, this should be called first.
"""
# Called from htest, TextFrame, Editor, and Turtledemo.
# Not automatic because ColorDelegator does not know 'text'.
theme = idleConf.CurrentTheme()
normal_colors = idleConf.GetHighlight(theme, 'normal')
Expand All @@ -50,6 +51,7 @@ def color_config(text): # Called from htest, Editor, and Turtle Demo.
inactiveselectbackground=select_colors['background'], # new in 8.5
)


class ColorDelegator(Delegator):

def __init__(self):
Expand Down Expand Up @@ -285,6 +287,7 @@ def _color_delegator(parent): # htest #
d = ColorDelegator()
p.insertfilter(d)


if __name__ == "__main__":
from unittest import main
main('idlelib.idle_test.test_colorizer', verbosity=2, exit=False)
Expand Down
9 changes: 4 additions & 5 deletions Lib/idlelib/textview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
from tkinter.ttk import Frame, Scrollbar, Button
from tkinter.messagebox import showerror

from idlelib.colorizer import color_config


class TextFrame(Frame):
"Display text with scrollbar."
Expand All @@ -18,12 +20,9 @@ def __init__(self, parent, rawtext):
super().__init__(parent)
self['relief'] = 'sunken'
self['height'] = 700
# TODO: get fg/bg from theme.
self.bg = '#ffffff'
self.fg = '#000000'

self.text = text = Text(self, wrap='word', highlightthickness=0,
fg=self.fg, bg=self.bg)
self.text = text = Text(self, wrap='word', highlightthickness=0)
color_config(text)
self.scroll = scroll = Scrollbar(self, orient='vertical',
takefocus=False, command=text.yview)
text['yscrollcommand'] = scroll.set
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/IDLE/2018-09-22-20-25-07.bpo-34548.7pBzjg.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use configured color theme for read-only text views.