From c4abf7ad0749bd9ed97b5a2c7704945c3d7d646c Mon Sep 17 00:00:00 2001 From: Cheryl Sabella Date: Thu, 22 Jun 2017 20:52:55 -0400 Subject: [PATCH 1/3] bpo-24813: IDLE: Add icon to help_about --- Lib/idlelib/help_about.py | 14 +++++++++++--- Lib/idlelib/idle_test/test_help_about.py | 8 ++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py index f0a40e927c3634..246e1fcb2a0352 100644 --- a/Lib/idlelib/help_about.py +++ b/Lib/idlelib/help_about.py @@ -4,8 +4,8 @@ import os from sys import version -from tkinter import Toplevel, Frame, Label, Button -from tkinter import SUNKEN, TOP, BOTTOM, LEFT, X, BOTH, W, EW, NSEW +from tkinter import Toplevel, Frame, Label, Button, PhotoImage +from tkinter import SUNKEN, TOP, BOTTOM, LEFT, X, BOTH, W, EW, NSEW, NE from idlelib import textview @@ -63,6 +63,15 @@ def create_widgets(self): header = Label(frame_background, text='IDLE', fg=self.fg, bg=self.bg, font=('courier', 24, 'bold')) header.grid(row=0, column=0, sticky=W, padx=10, pady=10) + + tk_patchlevel = self.tk.call('info', 'patchlevel') + ext = '.png' if tk_patchlevel >= '8.6' else '.gif' + iconfn = os.path.join(os.path.abspath(os.path.dirname(__file__)), + 'Icons', f'idle_48{ext}') + self.icon_image = PhotoImage(master=self._root(), file=iconfn) + logo = Label(frame_background, image=self.icon_image, bg=self.bg) + logo.grid(row=0, column=0, sticky=NE, rowspan=2, padx=10, pady=10) + byline_text = "Python's Integrated DeveLopment Environment" + 5*'\n' byline = Label(frame_background, text=byline_text, justify=LEFT, fg=self.fg, bg=self.bg) @@ -82,7 +91,6 @@ def create_widgets(self): pyver = Label(frame_background, text='Python version: ' + release, fg=self.fg, bg=self.bg) pyver.grid(row=9, column=0, sticky=W, padx=10, pady=0) - tk_patchlevel = self.tk.call('info', 'patchlevel') tkver = Label(frame_background, text='Tk version: ' + tk_patchlevel, fg=self.fg, bg=self.bg) tkver.grid(row=9, column=1, sticky=W, padx=2, pady=0) diff --git a/Lib/idlelib/idle_test/test_help_about.py b/Lib/idlelib/idle_test/test_help_about.py index 15d1b6b42c797a..b4137867063c37 100644 --- a/Lib/idlelib/idle_test/test_help_about.py +++ b/Lib/idlelib/idle_test/test_help_about.py @@ -5,10 +5,12 @@ from test.support import requires, findfile from tkinter import Tk, TclError import unittest +from unittest import mock from idlelib.idle_test.mock_idle import Func from idlelib.idle_test.mock_tk import Mbox_func from idlelib.help_about import AboutDialog as About from idlelib import textview +import os.path class LiveDialogTest(unittest.TestCase): """Simulate user clicking buttons other than [Close]. @@ -33,6 +35,12 @@ def test_dialog_title(self): """Test about dialog title""" self.assertEqual(self.dialog.title(), 'About IDLE') + def test_dialog_logo(self): + """Test about dialog logo.""" + path, file = os.path.split(self.dialog.icon_image['file']) + fn, ext = os.path.splitext(file) + self.assertEqual(fn, 'idle_48') + def test_printer_buttons(self): """Test buttons whose commands use printer function.""" dialog = self.dialog From 58dbd10381a671cd8371bffe153b5ed04b4f41a2 Mon Sep 17 00:00:00 2001 From: Cheryl Sabella Date: Thu, 22 Jun 2017 20:54:23 -0400 Subject: [PATCH 2/3] bpo-24813: IDLE: Add icon to help_about --- Lib/idlelib/idle_test/test_help_about.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/idlelib/idle_test/test_help_about.py b/Lib/idlelib/idle_test/test_help_about.py index b4137867063c37..f3ca75cf0182bf 100644 --- a/Lib/idlelib/idle_test/test_help_about.py +++ b/Lib/idlelib/idle_test/test_help_about.py @@ -5,7 +5,6 @@ from test.support import requires, findfile from tkinter import Tk, TclError import unittest -from unittest import mock from idlelib.idle_test.mock_idle import Func from idlelib.idle_test.mock_tk import Mbox_func from idlelib.help_about import AboutDialog as About From 3b456dc2c10a9e6d3b85c80c9d456aea32f44402 Mon Sep 17 00:00:00 2001 From: Cheryl Sabella Date: Fri, 23 Jun 2017 07:10:09 -0400 Subject: [PATCH 3/3] bpo-24813: IDLE: Add icon to help_about --- Lib/idlelib/help_about.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py index 246e1fcb2a0352..e65e67c47ee0d7 100644 --- a/Lib/idlelib/help_about.py +++ b/Lib/idlelib/help_about.py @@ -5,7 +5,7 @@ from sys import version from tkinter import Toplevel, Frame, Label, Button, PhotoImage -from tkinter import SUNKEN, TOP, BOTTOM, LEFT, X, BOTH, W, EW, NSEW, NE +from tkinter import SUNKEN, TOP, BOTTOM, LEFT, X, BOTH, W, EW, NSEW, E from idlelib import textview @@ -62,15 +62,15 @@ def create_widgets(self): header = Label(frame_background, text='IDLE', fg=self.fg, bg=self.bg, font=('courier', 24, 'bold')) - header.grid(row=0, column=0, sticky=W, padx=10, pady=10) + header.grid(row=0, column=0, sticky=E, padx=10, pady=10) tk_patchlevel = self.tk.call('info', 'patchlevel') ext = '.png' if tk_patchlevel >= '8.6' else '.gif' - iconfn = os.path.join(os.path.abspath(os.path.dirname(__file__)), - 'Icons', f'idle_48{ext}') - self.icon_image = PhotoImage(master=self._root(), file=iconfn) + icon = os.path.join(os.path.abspath(os.path.dirname(__file__)), + 'Icons', f'idle_48{ext}') + self.icon_image = PhotoImage(master=self._root(), file=icon) logo = Label(frame_background, image=self.icon_image, bg=self.bg) - logo.grid(row=0, column=0, sticky=NE, rowspan=2, padx=10, pady=10) + logo.grid(row=0, column=0, sticky=W, rowspan=2, padx=10, pady=10) byline_text = "Python's Integrated DeveLopment Environment" + 5*'\n' byline = Label(frame_background, text=byline_text, justify=LEFT,