[Python-checkins] r63919 - in sandbox/trunk/ttk-gsoc/src: 2.x/ttk.py 3.x/ttk.py idlelib_ttk.diff
guilherme.polo
python-checkins at python.org
Tue Jun 3 15:15:06 CEST 2008
Author: guilherme.polo
Date: Tue Jun 3 15:15:06 2008
New Revision: 63919
Log:
Added a set_menu method for OptionMenu;
idlelib_ttk:
Removed some duplicated code which got there accidently;
It uses ttk Scrollbar at EditorWindow;
No longer Message usage, changed it to a simple Label;
Some other minor fixes.
Modified:
sandbox/trunk/ttk-gsoc/src/2.x/ttk.py
sandbox/trunk/ttk-gsoc/src/3.x/ttk.py
sandbox/trunk/ttk-gsoc/src/idlelib_ttk.diff
Modified: sandbox/trunk/ttk-gsoc/src/2.x/ttk.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/2.x/ttk.py (original)
+++ sandbox/trunk/ttk-gsoc/src/2.x/ttk.py Tue Jun 3 15:15:06 2008
@@ -1332,33 +1332,42 @@
the resource textvariable set to variable, the initially selected
value specified by the value parameter, the other menu values
given by *values and an additional keyword argument command."""
- kw = {'textvariable': variable, 'style': kwargs.pop('style', None)}
+ kw = {'textvariable': variable, 'style': kwargs.pop('style', None),
+ 'direction': kwargs.pop('direction', None)}
Menubutton.__init__(self, master, **kw)
- menu = self.__menu = Tkinter.Menu(self, name="menu", tearoff=0)
- self.menuname = menu._w
-
- callback = kwargs.pop('command', None)
+ self._menu = Tkinter.Menu(self, name="menu", tearoff=0)
+ self._callback = kwargs.pop('command', None)
+ self._variable = variable
if kwargs:
raise Tkinter.TclError('unknown option -%s' % (
next(kwargs.iterkeys())))
- menu.add_command(label=value,
- command=Tkinter._setit(variable, value, callback))
- for v in values:
- menu.add_command(label=v,
- command=Tkinter._setit(variable, v, callback))
- self['menu'] = menu
+ self['menu'] = self._menu
+ self.set_menu(value, *((value, ) + values))
def __getitem__(self, item):
if item == 'menu':
- return self.__menu
+ return self._menu
return Menubutton.__getitem__(self, item)
+ def set_menu(self, default=None, *values):
+ """Build a new menu of radiobuttons with *values and optionally
+ a default value."""
+ menu = self._menu
+ menu.delete(0, 'end')
+ for v in values:
+ menu.add_radiobutton(label=v,
+ command=Tkinter._setit(self._variable, v, self._callback))
+
+ if default:
+ self._variable.set(default)
+
+
def destroy(self):
"""Destroy this widget and the associated menu."""
Menubutton.destroy(self)
- self.__menu = None
+ self._menu = None
Modified: sandbox/trunk/ttk-gsoc/src/3.x/ttk.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/3.x/ttk.py (original)
+++ sandbox/trunk/ttk-gsoc/src/3.x/ttk.py Tue Jun 3 15:15:06 2008
@@ -1332,33 +1332,42 @@
the resource textvariable set to variable, the initially selected
value specified by the value parameter, the other menu values
given by *values and an additional keyword argument command."""
- kw = {'textvariable': variable, 'style': kwargs.pop('style', None)}
+ kw = {'textvariable': variable, 'style': kwargs.pop('style', None),
+ 'direction': kwargs.pop('direction', None)}
Menubutton.__init__(self, master, **kw)
- menu = self.__menu = tkinter.Menu(self, name="menu", tearoff=0)
- self.menuname = menu._w
-
- callback = kwargs.pop('command', None)
+ self._menu = tkinter.Menu(self, name="menu", tearoff=0)
+ self._callback = kwargs.pop('command', None)
+ self._variable = variable
if kwargs:
raise tkinter.TclError('unknown option -%s' % (
next(iter(kwargs.keys()))))
- menu.add_command(label=value,
- command=tkinter._setit(variable, value, callback))
- for v in values:
- menu.add_command(label=v,
- command=tkinter._setit(variable, v, callback))
- self['menu'] = menu
+ self['menu'] = self._menu
+ self.set_menu(value, *((value, ) + values))
def __getitem__(self, item):
if item == 'menu':
- return self.__menu
+ return self._menu
return Menubutton.__getitem__(self, item)
+ def set_menu(self, default=None, *values):
+ """Build a new menu of radiobuttons with *values and optionally
+ a default value."""
+ menu = self['menu']
+ menu.delete(0, 'end')
+ for v in values:
+ menu.add_radiobutton(label=v,
+ command=tkinter._setit(self._variable, v, self._callback))
+
+ if default:
+ self._variable.set(default)
+
+
def destroy(self):
"""Destroy this widget and the associated menu."""
Menubutton.destroy(self)
- self.__menu = None
+ self._menu = None
Modified: sandbox/trunk/ttk-gsoc/src/idlelib_ttk.diff
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/idlelib_ttk.diff (original)
+++ sandbox/trunk/ttk-gsoc/src/idlelib_ttk.diff Tue Jun 3 15:15:06 2008
@@ -1,6 +1,6 @@
Index: Lib/idlelib/AutoCompleteWindow.py
===================================================================
---- Lib/idlelib/AutoCompleteWindow.py (revision 63867)
+--- Lib/idlelib/AutoCompleteWindow.py (revision 63916)
+++ Lib/idlelib/AutoCompleteWindow.py (working copy)
@@ -4,7 +4,11 @@
from Tkinter import *
@@ -16,7 +16,7 @@
KEYPRESS_VIRTUAL_EVENT_NAME = "<<autocompletewindow-keypress>>"
Index: Lib/idlelib/ToolTip.py
===================================================================
---- Lib/idlelib/ToolTip.py (revision 63867)
+--- Lib/idlelib/ToolTip.py (revision 63916)
+++ Lib/idlelib/ToolTip.py (working copy)
@@ -3,7 +3,8 @@
# may be useful for some purposes in (or almost in ;) the current project scope
@@ -30,7 +30,7 @@
Index: Lib/idlelib/configSectionNameDialog.py
===================================================================
---- Lib/idlelib/configSectionNameDialog.py (revision 63867)
+--- Lib/idlelib/configSectionNameDialog.py (revision 63916)
+++ Lib/idlelib/configSectionNameDialog.py (working copy)
@@ -4,7 +4,12 @@
"""
@@ -45,53 +45,45 @@
class GetCfgSectionNameDialog(Toplevel):
def __init__(self,parent,title,message,usedNames):
"""
-@@ -55,6 +60,9 @@
+@@ -25,8 +30,6 @@
+ self.CreateWidgets()
+ self.withdraw() #hide while setting geometry
+ self.update_idletasks()
+- #needs to be done here so that the winfo_reqwidth is valid
+- self.messageInfo.config(width=self.frameMain.winfo_reqwidth())
+ self.geometry("+%d+%d" %
+ ((parent.winfo_rootx()+((parent.winfo_width()/2)
+ -(self.winfo_reqwidth()/2)),
+@@ -40,11 +43,10 @@
+ self.fontSize=StringVar(self)
+ self.frameMain = Frame(self,borderwidth=2,relief=SUNKEN)
+ self.frameMain.pack(side=TOP,expand=TRUE,fill=BOTH)
+- self.messageInfo=Message(self.frameMain,anchor=W,justify=LEFT,padx=5,pady=5,
+- text=self.message)#,aspect=200)
++ self.messageInfo= Label(self.frameMain, text=self.message)
+ entryName=Entry(self.frameMain,textvariable=self.name,width=30)
+ entryName.focus_set()
+- self.messageInfo.pack(padx=5,pady=5)#,expand=TRUE,fill=BOTH)
++ self.messageInfo.pack(padx=5,pady=5)
+ entryName.pack(padx=5,pady=5)
+ frameButtons=Frame(self)
+ frameButtons.pack(side=BOTTOM,fill=X)
+@@ -55,6 +57,12 @@
width=8,command=self.Cancel)
self.buttonCancel.grid(row=0,column=1,padx=5,pady=5)
+ if TTK:
-+ frameButton['style'] = 'RootColor.TFrame'
++ self.messageInfo['padding'] = 5
++ frameButtons['style'] = 'RootColor.TFrame'
++ else:
++ self.messageInfo.configure(padx=5, pady=5)
+
def NameOk(self):
#simple validity check for a sensible
#ConfigParser file section name
-Index: Lib/idlelib/stylist.py
-===================================================================
---- Lib/idlelib/stylist.py (revision 0)
-+++ Lib/idlelib/stylist.py (revision 0)
-@@ -0,0 +1,29 @@
-+from configHandler import idleConf
-+
-+TTK = idleConf.GetOption('main', 'General', 'use-ttk', type='int')
-+
-+class PoorManStyle(object):
-+ def __init__(self, parent, styles=None, cfgstyles=None):
-+ self.parent = parent
-+ self.cfgstyles = cfgstyles
-+ self.styles = styles
-+
-+ def configure(self, style, lookup=None, background=None):
-+ if style not in self.cfgstyles: # passed wrong style probably
-+ return
-+
-+ widget = getattr(self.parent, self.cfgstyles[style])
-+ if lookup:
-+ return widget.cget('bg')
-+
-+ widget.configure(bg=background)
-+
-+ def style_it(self, w, style):
-+ if TTK:
-+ w['style'] = style
-+ return
-+
-+ if not style in self.styles: # may not need to be styled
-+ return
-+
-+ w.configure(**self.styles[style])
Index: Lib/idlelib/PyShell.py
===================================================================
---- Lib/idlelib/PyShell.py (revision 63867)
+--- Lib/idlelib/PyShell.py (revision 63916)
+++ Lib/idlelib/PyShell.py (working copy)
@@ -22,14 +22,26 @@
print>>sys.__stderr__, "** IDLE can't import Tkinter. " \
@@ -143,7 +135,7 @@
flist = PyShellFileList(root)
Index: Lib/idlelib/Debugger.py
===================================================================
---- Lib/idlelib/Debugger.py (revision 63867)
+--- Lib/idlelib/Debugger.py (revision 63916)
+++ Lib/idlelib/Debugger.py (working copy)
@@ -4,8 +4,11 @@
from Tkinter import *
@@ -175,7 +167,7 @@
self.repr.maxstring = 60
Index: Lib/idlelib/configDialog.py
===================================================================
---- Lib/idlelib/configDialog.py (revision 63867)
+--- Lib/idlelib/configDialog.py (revision 63916)
+++ Lib/idlelib/configDialog.py (working copy)
@@ -7,7 +7,6 @@
@@ -396,7 +388,7 @@
if self.themeIsBuiltin.get(): #a default theme
Index: Lib/idlelib/ReplaceDialog.py
===================================================================
---- Lib/idlelib/ReplaceDialog.py (revision 63867)
+--- Lib/idlelib/ReplaceDialog.py (revision 63916)
+++ Lib/idlelib/ReplaceDialog.py (working copy)
@@ -11,9 +11,12 @@
dialog.open(text)
@@ -430,7 +422,7 @@
self.do_find(0)
Index: Lib/idlelib/tabbedpages.py
===================================================================
---- Lib/idlelib/tabbedpages.py (revision 63867)
+--- Lib/idlelib/tabbedpages.py (revision 63916)
+++ Lib/idlelib/tabbedpages.py (working copy)
@@ -1,490 +1,4 @@
-"""An implementation of tabbed pages using only standard Tkinter.
@@ -929,7 +921,7 @@
+ from idlelib.tabbedpages_old import TabbedPageSet
Index: Lib/idlelib/keybindingDialog.py
===================================================================
---- Lib/idlelib/keybindingDialog.py (revision 63867)
+--- Lib/idlelib/keybindingDialog.py (revision 63916)
+++ Lib/idlelib/keybindingDialog.py (working copy)
@@ -5,6 +5,12 @@
import tkMessageBox
@@ -956,7 +948,7 @@
Index: Lib/idlelib/configHelpSourceEdit.py
===================================================================
---- Lib/idlelib/configHelpSourceEdit.py (revision 63867)
+--- Lib/idlelib/configHelpSourceEdit.py (revision 63916)
+++ Lib/idlelib/configHelpSourceEdit.py (working copy)
@@ -6,7 +6,12 @@
from Tkinter import *
@@ -997,7 +989,7 @@
("HTML Files", "*.htm *.html", "TEXT"),
Index: Lib/idlelib/GrepDialog.py
===================================================================
---- Lib/idlelib/GrepDialog.py (revision 63867)
+--- Lib/idlelib/GrepDialog.py (revision 63916)
+++ Lib/idlelib/GrepDialog.py (working copy)
@@ -4,7 +4,11 @@
from Tkinter import *
@@ -1058,9 +1050,20 @@
- self.top.withdraw()
Index: Lib/idlelib/EditorWindow.py
===================================================================
---- Lib/idlelib/EditorWindow.py (revision 63867)
+--- Lib/idlelib/EditorWindow.py (revision 63916)
+++ Lib/idlelib/EditorWindow.py (working copy)
-@@ -365,7 +365,7 @@
+@@ -19,6 +19,10 @@
+ import aboutDialog, textView, configDialog
+ import macosxSupport
+
++if idleConf.GetOption('main', 'General', 'use-ttk', type='int'):
++ from ttk import Scrollbar
++
++
+ # The default tab setting for a Text widget, in average-width characters.
+ TK_TABWIDTH_DEFAULT = 8
+
+@@ -365,7 +369,7 @@
self.menudict = menudict = {}
for name, label in self.menu_specs:
underline, label = prepstr(label)
@@ -1071,7 +1074,7 @@
if sys.platform == 'darwin' and '.framework' in sys.executable:
Index: Lib/idlelib/aboutDialog.py
===================================================================
---- Lib/idlelib/aboutDialog.py (revision 63867)
+--- Lib/idlelib/aboutDialog.py (revision 63916)
+++ Lib/idlelib/aboutDialog.py (working copy)
@@ -1,13 +1,17 @@
-"""About Dialog for IDLE
@@ -1242,7 +1245,7 @@
Index: Lib/idlelib/config-main.def
===================================================================
---- Lib/idlelib/config-main.def (revision 63867)
+--- Lib/idlelib/config-main.def (revision 63916)
+++ Lib/idlelib/config-main.def (working copy)
@@ -49,6 +49,7 @@
print-command-posix=lpr %s
@@ -1254,7 +1257,7 @@
width= 80
Index: Lib/idlelib/IOBinding.py
===================================================================
---- Lib/idlelib/IOBinding.py (revision 63867)
+--- Lib/idlelib/IOBinding.py (revision 63916)
+++ Lib/idlelib/IOBinding.py (working copy)
@@ -18,6 +18,9 @@
@@ -1268,7 +1271,7 @@
except ImportError:
Index: Lib/idlelib/ScrolledList.py
===================================================================
---- Lib/idlelib/ScrolledList.py (revision 63867)
+--- Lib/idlelib/ScrolledList.py (revision 63916)
+++ Lib/idlelib/ScrolledList.py (working copy)
@@ -1,5 +1,9 @@
from Tkinter import *
@@ -1282,7 +1285,7 @@
default = "(None)"
Index: Lib/idlelib/textView.py
===================================================================
---- Lib/idlelib/textView.py (revision 63867)
+--- Lib/idlelib/textView.py (revision 63916)
+++ Lib/idlelib/textView.py (working copy)
@@ -1,10 +1,13 @@
-"""Simple text browser for IDLE
@@ -1329,7 +1332,7 @@
Index: Lib/idlelib/CallTipWindow.py
===================================================================
---- Lib/idlelib/CallTipWindow.py (revision 63867)
+--- Lib/idlelib/CallTipWindow.py (revision 63916)
+++ Lib/idlelib/CallTipWindow.py (working copy)
@@ -5,7 +5,11 @@
@@ -1354,7 +1357,7 @@
c=container()
Index: Lib/idlelib/SearchDialogBase.py
===================================================================
---- Lib/idlelib/SearchDialogBase.py (revision 63867)
+--- Lib/idlelib/SearchDialogBase.py (revision 63916)
+++ Lib/idlelib/SearchDialogBase.py (working copy)
@@ -1,35 +1,40 @@
from Tkinter import *
@@ -1559,7 +1562,7 @@
+ column += 1
Index: Lib/idlelib/SearchDialog.py
===================================================================
---- Lib/idlelib/SearchDialog.py (revision 63867)
+--- Lib/idlelib/SearchDialog.py (revision 63916)
+++ Lib/idlelib/SearchDialog.py (working copy)
@@ -21,10 +21,10 @@
return _setup(text).find_selection(text)
@@ -1574,504 +1577,9 @@
def default_command(self, event=None):
if not self.engine.getprog():
-Index: Lib/idlelib/tabbedpages_old.py
-===================================================================
---- Lib/idlelib/tabbedpages_old.py (revision 0)
-+++ Lib/idlelib/tabbedpages_old.py (revision 0)
-@@ -0,0 +1,490 @@
-+"""An implementation of tabbed pages using only standard Tkinter.
-+
-+Originally developed for use in IDLE. Based on tabpage.py.
-+
-+Classes exported:
-+TabbedPageSet -- A Tkinter implementation of a tabbed-page widget.
-+TabSet -- A widget containing tabs (buttons) in one or more rows.
-+
-+"""
-+from Tkinter import *
-+
-+class InvalidNameError(Exception): pass
-+class AlreadyExistsError(Exception): pass
-+
-+
-+class TabSet(Frame):
-+ """A widget containing tabs (buttons) in one or more rows.
-+
-+ Only one tab may be selected at a time.
-+
-+ """
-+ def __init__(self, page_set, select_command,
-+ tabs=None, n_rows=1, max_tabs_per_row=5,
-+ expand_tabs=False, **kw):
-+ """Constructor arguments:
-+
-+ select_command -- A callable which will be called when a tab is
-+ selected. It is called with the name of the selected tab as an
-+ argument.
-+
-+ tabs -- A list of strings, the names of the tabs. Should be specified in
-+ the desired tab order. The first tab will be the default and first
-+ active tab. If tabs is None or empty, the TabSet will be initialized
-+ empty.
-+
-+ n_rows -- Number of rows of tabs to be shown. If n_rows <= 0 or is
-+ None, then the number of rows will be decided by TabSet. See
-+ _arrange_tabs() for details.
-+
-+ max_tabs_per_row -- Used for deciding how many rows of tabs are needed,
-+ when the number of rows is not constant. See _arrange_tabs() for
-+ details.
-+
-+ """
-+ Frame.__init__(self, page_set, **kw)
-+ self.select_command = select_command
-+ self.n_rows = n_rows
-+ self.max_tabs_per_row = max_tabs_per_row
-+ self.expand_tabs = expand_tabs
-+ self.page_set = page_set
-+
-+ self._tabs = {}
-+ self._tab2row = {}
-+ if tabs:
-+ self._tab_names = list(tabs)
-+ else:
-+ self._tab_names = []
-+ self._selected_tab = None
-+ self._tab_rows = []
-+
-+ self.padding_frame = Frame(self, height=2,
-+ borderwidth=0, relief=FLAT,
-+ background=self.cget('background'))
-+ self.padding_frame.pack(side=TOP, fill=X, expand=False)
-+
-+ self._arrange_tabs()
-+
-+ def add_tab(self, tab_name):
-+ """Add a new tab with the name given in tab_name."""
-+ if not tab_name:
-+ raise InvalidNameError("Invalid Tab name: '%s'" % tab_name)
-+ if tab_name in self._tab_names:
-+ raise AlreadyExistsError("Tab named '%s' already exists" %tab_name)
-+
-+ self._tab_names.append(tab_name)
-+ self._arrange_tabs()
-+
-+ def remove_tab(self, tab_name):
-+ """Remove the tab named <tab_name>"""
-+ if not tab_name in self._tab_names:
-+ raise KeyError("No such Tab: '%s" % page_name)
-+
-+ self._tab_names.remove(tab_name)
-+ self._arrange_tabs()
-+
-+ def set_selected_tab(self, tab_name):
-+ """Show the tab named <tab_name> as the selected one"""
-+ if tab_name == self._selected_tab:
-+ return
-+ if tab_name is not None and tab_name not in self._tabs:
-+ raise KeyError("No such Tab: '%s" % page_name)
-+
-+ # deselect the current selected tab
-+ if self._selected_tab is not None:
-+ self._tabs[self._selected_tab].set_normal()
-+ self._selected_tab = None
-+
-+ if tab_name is not None:
-+ # activate the tab named tab_name
-+ self._selected_tab = tab_name
-+ tab = self._tabs[tab_name]
-+ tab.set_selected()
-+ # move the tab row with the selected tab to the bottom
-+ tab_row = self._tab2row[tab]
-+ tab_row.pack_forget()
-+ tab_row.pack(side=TOP, fill=X, expand=0)
-+
-+ def _add_tab_row(self, tab_names, expand_tabs):
-+ if not tab_names:
-+ return
-+
-+ tab_row = Frame(self)
-+ tab_row.pack(side=TOP, fill=X, expand=0)
-+ self._tab_rows.append(tab_row)
-+
-+ for tab_name in tab_names:
-+ tab = TabSet.TabButton(tab_name, self.select_command,
-+ tab_row, self)
-+ if expand_tabs:
-+ tab.pack(side=LEFT, fill=X, expand=True)
-+ else:
-+ tab.pack(side=LEFT)
-+ self._tabs[tab_name] = tab
-+ self._tab2row[tab] = tab_row
-+
-+ # tab is the last one created in the above loop
-+ tab.is_last_in_row = True
-+
-+ def _reset_tab_rows(self):
-+ while self._tab_rows:
-+ tab_row = self._tab_rows.pop()
-+ tab_row.destroy()
-+ self._tab2row = {}
-+
-+ def _arrange_tabs(self):
-+ """
-+ Arrange the tabs in rows, in the order in which they were added.
-+
-+ If n_rows >= 1, this will be the number of rows used. Otherwise the
-+ number of rows will be calculated according to the number of tabs and
-+ max_tabs_per_row. In this case, the number of rows may change when
-+ adding/removing tabs.
-+
-+ """
-+ # remove all tabs and rows
-+ while self._tabs:
-+ self._tabs.popitem()[1].destroy()
-+ self._reset_tab_rows()
-+
-+ if not self._tab_names:
-+ return
-+
-+ if self.n_rows is not None and self.n_rows > 0:
-+ n_rows = self.n_rows
-+ else:
-+ # calculate the required number of rows
-+ n_rows = (len(self._tab_names) - 1) // self.max_tabs_per_row + 1
-+
-+ # not expanding the tabs with more than one row is very ugly
-+ expand_tabs = self.expand_tabs or n_rows > 1
-+ i = 0 # index in self._tab_names
-+ for row_index in range(n_rows):
-+ # calculate required number of tabs in this row
-+ n_tabs = (len(self._tab_names) - i - 1) // (n_rows - row_index) + 1
-+ tab_names = self._tab_names[i:i + n_tabs]
-+ i += n_tabs
-+ self._add_tab_row(tab_names, expand_tabs)
-+
-+ # re-select selected tab so it is properly displayed
-+ selected = self._selected_tab
-+ self.set_selected_tab(None)
-+ if selected in self._tab_names:
-+ self.set_selected_tab(selected)
-+
-+ class TabButton(Frame):
-+ """A simple tab-like widget."""
-+
-+ bw = 2 # borderwidth
-+
-+ def __init__(self, name, select_command, tab_row, tab_set):
-+ """Constructor arguments:
-+
-+ name -- The tab's name, which will appear in its button.
-+
-+ select_command -- The command to be called upon selection of the
-+ tab. It is called with the tab's name as an argument.
-+
-+ """
-+ Frame.__init__(self, tab_row, borderwidth=self.bw, relief=RAISED)
-+
-+ self.name = name
-+ self.select_command = select_command
-+ self.tab_set = tab_set
-+ self.is_last_in_row = False
-+
-+ self.button = Radiobutton(
-+ self, text=name, command=self._select_event,
-+ padx=5, pady=1, takefocus=FALSE, indicatoron=FALSE,
-+ highlightthickness=0, selectcolor='', borderwidth=0)
-+ self.button.pack(side=LEFT, fill=X, expand=True)
-+
-+ self._init_masks()
-+ self.set_normal()
-+
-+ def _select_event(self, *args):
-+ """Event handler for tab selection.
-+
-+ With TabbedPageSet, this calls TabbedPageSet.change_page, so that
-+ selecting a tab changes the page.
-+
-+ Note that this does -not- call set_selected -- it will be called by
-+ TabSet.set_selected_tab, which should be called when whatever the
-+ tabs are related to changes.
-+
-+ """
-+ self.select_command(self.name)
-+ return
-+
-+ def set_selected(self):
-+ """Assume selected look"""
-+ self._place_masks(selected=True)
-+
-+ def set_normal(self):
-+ """Assume normal look"""
-+ self._place_masks(selected=False)
-+
-+ def _init_masks(self):
-+ page_set = self.tab_set.page_set
-+ background = page_set.pages_frame.cget('background')
-+ # mask replaces the middle of the border with the background color
-+ self.mask = Frame(page_set, borderwidth=0, relief=FLAT,
-+ background=background)
-+ # mskl replaces the bottom-left corner of the border with a normal
-+ # left border
-+ self.mskl = Frame(page_set, borderwidth=0, relief=FLAT,
-+ background=background)
-+ self.mskl.ml = Frame(self.mskl, borderwidth=self.bw,
-+ relief=RAISED)
-+ self.mskl.ml.place(x=0, y=-self.bw,
-+ width=2*self.bw, height=self.bw*4)
-+ # mskr replaces the bottom-right corner of the border with a normal
-+ # right border
-+ self.mskr = Frame(page_set, borderwidth=0, relief=FLAT,
-+ background=background)
-+ self.mskr.mr = Frame(self.mskr, borderwidth=self.bw,
-+ relief=RAISED)
-+
-+ def _place_masks(self, selected=False):
-+ height = self.bw
-+ if selected:
-+ height += self.bw
-+
-+ self.mask.place(in_=self,
-+ relx=0.0, x=0,
-+ rely=1.0, y=0,
-+ relwidth=1.0, width=0,
-+ relheight=0.0, height=height)
-+
-+ self.mskl.place(in_=self,
-+ relx=0.0, x=-self.bw,
-+ rely=1.0, y=0,
-+ relwidth=0.0, width=self.bw,
-+ relheight=0.0, height=height)
-+
-+ page_set = self.tab_set.page_set
-+ if selected and ((not self.is_last_in_row) or
-+ (self.winfo_rootx() + self.winfo_width() <
-+ page_set.winfo_rootx() + page_set.winfo_width())
-+ ):
-+ # for a selected tab, if its rightmost edge isn't on the
-+ # rightmost edge of the page set, the right mask should be one
-+ # borderwidth shorter (vertically)
-+ height -= self.bw
-+
-+ self.mskr.place(in_=self,
-+ relx=1.0, x=0,
-+ rely=1.0, y=0,
-+ relwidth=0.0, width=self.bw,
-+ relheight=0.0, height=height)
-+
-+ self.mskr.mr.place(x=-self.bw, y=-self.bw,
-+ width=2*self.bw, height=height + self.bw*2)
-+
-+ # finally, lower the tab set so that all of the frames we just
-+ # placed hide it
-+ self.tab_set.lower()
-+
-+class TabbedPageSet(Frame):
-+ """A Tkinter tabbed-pane widget.
-+
-+ Constains set of 'pages' (or 'panes') with tabs above for selecting which
-+ page is displayed. Only one page will be displayed at a time.
-+
-+ Pages may be accessed through the 'pages' attribute, which is a dictionary
-+ of pages, using the name given as the key. A page is an instance of a
-+ subclass of Tk's Frame widget.
-+
-+ The page widgets will be created (and destroyed when required) by the
-+ TabbedPageSet. Do not call the page's pack/place/grid/destroy methods.
-+
-+ Pages may be added or removed at any time using the add_page() and
-+ remove_page() methods.
-+
-+ """
-+ class Page(object):
-+ """Abstract base class for TabbedPageSet's pages.
-+
-+ Subclasses must override the _show() and _hide() methods.
-+
-+ """
-+ uses_grid = False
-+
-+ def __init__(self, page_set):
-+ self.frame = Frame(page_set, borderwidth=2, relief=RAISED)
-+
-+ def _show(self):
-+ raise NotImplementedError
-+
-+ def _hide(self):
-+ raise NotImplementedError
-+
-+ class PageRemove(Page):
-+ """Page class using the grid placement manager's "remove" mechanism."""
-+ uses_grid = True
-+
-+ def _show(self):
-+ self.frame.grid(row=0, column=0, sticky=NSEW)
-+
-+ def _hide(self):
-+ self.frame.grid_remove()
-+
-+ class PageLift(Page):
-+ """Page class using the grid placement manager's "lift" mechanism."""
-+ uses_grid = True
-+
-+ def __init__(self, page_set):
-+ super(TabbedPageSet.PageLift, self).__init__(page_set)
-+ self.frame.grid(row=0, column=0, sticky=NSEW)
-+ self.frame.lower()
-+
-+ def _show(self):
-+ self.frame.lift()
-+
-+ def _hide(self):
-+ self.frame.lower()
-+
-+ class PagePackForget(Page):
-+ """Page class using the pack placement manager's "forget" mechanism."""
-+ def _show(self):
-+ self.frame.pack(fill=BOTH, expand=True)
-+
-+ def _hide(self):
-+ self.frame.pack_forget()
-+
-+ def __init__(self, parent, page_names=None, page_class=PageLift,
-+ n_rows=1, max_tabs_per_row=5, expand_tabs=False,
-+ **kw):
-+ """Constructor arguments:
-+
-+ page_names -- A list of strings, each will be the dictionary key to a
-+ page's widget, and the name displayed on the page's tab. Should be
-+ specified in the desired page order. The first page will be the default
-+ and first active page. If page_names is None or empty, the
-+ TabbedPageSet will be initialized empty.
-+
-+ n_rows, max_tabs_per_row -- Parameters for the TabSet which will
-+ manage the tabs. See TabSet's docs for details.
-+
-+ page_class -- Pages can be shown/hidden using three mechanisms:
-+
-+ * PageLift - All pages will be rendered one on top of the other. When
-+ a page is selected, it will be brought to the top, thus hiding all
-+ other pages. Using this method, the TabbedPageSet will not be resized
-+ when pages are switched. (It may still be resized when pages are
-+ added/removed.)
-+
-+ * PageRemove - When a page is selected, the currently showing page is
-+ hidden, and the new page shown in its place. Using this method, the
-+ TabbedPageSet may resize when pages are changed.
-+
-+ * PagePackForget - This mechanism uses the pack placement manager.
-+ When a page is shown it is packed, and when it is hidden it is
-+ unpacked (i.e. pack_forget). This mechanism may also cause the
-+ TabbedPageSet to resize when the page is changed.
-+
-+ """
-+ Frame.__init__(self, parent, **kw)
-+
-+ self.page_class = page_class
-+ self.pages = {}
-+ self._pages_order = []
-+ self._current_page = None
-+ self._default_page = None
-+
-+ self.columnconfigure(0, weight=1)
-+ self.rowconfigure(1, weight=1)
-+
-+ self.pages_frame = Frame(self)
-+ self.pages_frame.grid(row=1, column=0, sticky=NSEW)
-+ if self.page_class.uses_grid:
-+ self.pages_frame.columnconfigure(0, weight=1)
-+ self.pages_frame.rowconfigure(0, weight=1)
-+
-+ # the order of the following commands is important
-+ self._tab_set = TabSet(self, self.change_page, n_rows=n_rows,
-+ max_tabs_per_row=max_tabs_per_row,
-+ expand_tabs=expand_tabs)
-+ if page_names:
-+ for name in page_names:
-+ self.add_page(name)
-+ self._tab_set.grid(row=0, column=0, sticky=NSEW)
-+
-+ self.change_page(self._default_page)
-+
-+ def add_page(self, page_name):
-+ """Add a new page with the name given in page_name."""
-+ if not page_name:
-+ raise InvalidNameError("Invalid TabPage name: '%s'" % page_name)
-+ if page_name in self.pages:
-+ raise AlreadyExistsError(
-+ "TabPage named '%s' already exists" % page_name)
-+
-+ self.pages[page_name] = self.page_class(self.pages_frame)
-+ self._pages_order.append(page_name)
-+ self._tab_set.add_tab(page_name)
-+
-+ if len(self.pages) == 1: # adding first page
-+ self._default_page = page_name
-+ self.change_page(page_name)
-+
-+ def remove_page(self, page_name):
-+ """Destroy the page whose name is given in page_name."""
-+ if not page_name in self.pages:
-+ raise KeyError("No such TabPage: '%s" % page_name)
-+
-+ self._pages_order.remove(page_name)
-+
-+ # handle removing last remaining, default, or currently shown page
-+ if len(self._pages_order) > 0:
-+ if page_name == self._default_page:
-+ # set a new default page
-+ self._default_page = self._pages_order[0]
-+ else:
-+ self._default_page = None
-+
-+ if page_name == self._current_page:
-+ self.change_page(self._default_page)
-+
-+ self._tab_set.remove_tab(page_name)
-+ page = self.pages.pop(page_name)
-+ page.frame.destroy()
-+
-+ def change_page(self, page_name):
-+ """Show the page whose name is given in page_name."""
-+ if self._current_page == page_name:
-+ return
-+ if page_name is not None and page_name not in self.pages:
-+ raise KeyError("No such TabPage: '%s'" % page_name)
-+
-+ if self._current_page is not None:
-+ self.pages[self._current_page]._hide()
-+ self._current_page = None
-+
-+ if page_name is not None:
-+ self._current_page = page_name
-+ self.pages[page_name]._show()
-+
-+ self._tab_set.set_selected_tab(page_name)
-+
-+if __name__ == '__main__':
-+ # test dialog
-+ root=Tk()
-+ tabPage=TabbedPageSet(root, page_names=['Foobar','Baz'], n_rows=0,
-+ expand_tabs=False,
-+ )
-+ tabPage.pack(side=TOP, expand=TRUE, fill=BOTH)
-+ Label(tabPage.pages['Foobar'].frame, text='Foo', pady=20).pack()
-+ Label(tabPage.pages['Foobar'].frame, text='Bar', pady=20).pack()
-+ Label(tabPage.pages['Baz'].frame, text='Baz').pack()
-+ entryPgName=Entry(root)
-+ buttonAdd=Button(root, text='Add Page',
-+ command=lambda:tabPage.add_page(entryPgName.get()))
-+ buttonRemove=Button(root, text='Remove Page',
-+ command=lambda:tabPage.remove_page(entryPgName.get()))
-+ labelPgName=Label(root, text='name of page to add/remove:')
-+ buttonAdd.pack(padx=5, pady=5)
-+ buttonRemove.pack(padx=5, pady=5)
-+ labelPgName.pack(padx=5)
-+ entryPgName.pack(padx=5)
-+ root.mainloop()
Index: Lib/idlelib/TreeWidget.py
===================================================================
---- Lib/idlelib/TreeWidget.py (revision 63867)
+--- Lib/idlelib/TreeWidget.py (revision 63916)
+++ Lib/idlelib/TreeWidget.py (working copy)
@@ -21,6 +21,12 @@
import ZoomHeight
@@ -2106,101 +1614,11 @@
def test():
import PyShell
root = Toplevel(PyShell.root)
-Index: Lib/idlelib/tabbedpages_new.py
-===================================================================
---- Lib/idlelib/tabbedpages_new.py (revision 0)
-+++ Lib/idlelib/tabbedpages_new.py (revision 0)
-@@ -0,0 +1,85 @@
-+"""Classes exported:
-+
-+TabbedPageSet -- A custom ttk.Notebook used by IDLE.
-+"""
-+from Tkinter import *
-+from ttk import *
-+
-+class InvalidNameError(Exception): pass
-+class AlreadyExistsError(Exception): pass
-+
-+class FramePage(object):
-+ def __init__(self, notebook):
-+ self.frame = Frame(notebook)
-+
-+class TabbedPageSet(Notebook):
-+ """
-+ Pages may be accessed through the 'pages' attribute, which is a dictionary
-+ of pages, using the name given as the key. A page is an instance of a
-+ subclass of ttk's Frame widget.
-+
-+ Pages may be added or removed at any time using the add_page() and
-+ remove_page() methods.
-+ """
-+
-+ def __init__(self, master, page_names=None, **kw):
-+ """Constructor arguments:
-+
-+ page_names -- A list of strings, each will be the dictionary key to a
-+ page's widget, and the name displayed on the page's tab. Should be
-+ specified in the desired page order. The first page will be the default
-+ and first active page. If page_names is None or empty, the
-+ TabbedPageSet will be initialized empty.
-+ """
-+ Notebook.__init__(self, master, **kw)
-+
-+ self.pages = {}
-+ for name in page_names:
-+ self.add_page(name)
-+
-+ def add_page(self, page_name):
-+ """Add a new page with the name given in page_name."""
-+ if not page_name:
-+ raise InvalidNameError("Invalid TabPage name: '%s'" % page_name)
-+ if page_name in self.pages:
-+ raise AlreadyExistsError(
-+ "TabPage named '%s' already exists" % page_name)
-+
-+ fpage = FramePage(self)
-+ self.pages[page_name] = fpage
-+ self.add(fpage.frame, text=page_name, padding=6)
-+
-+ # workaround for bug #1878298 at tktoolkit sf bug tracker
-+ self.event_generate('<Expose>')
-+
-+ def remove_page(self, page_name):
-+ if not page_name in self.pages:
-+ raise KeyError("No such TabPage: '%s" % page_name)
-+
-+ self.forget(self.index(self.pages[page_name].frame))
-+ del self.pages[page_name]
-+
-+ # workaround for bug #1878298 at tktoolkit sf bug tracker
-+ self.event_generate('<Expose>')
-+
-+if __name__ == '__main__':
-+ # test dialog
-+ root=Tk()
-+ style = Style()
-+ style.configure('C.TLabel', padding=20)
-+ tabPage=TabbedPageSet(root, page_names=['Foobar','Baz'])
-+ tabPage.pack(side=TOP, expand=TRUE, fill=BOTH)
-+ Label(tabPage.pages['Foobar'].frame, text='Foo', style='C.TLabel').pack()
-+ Label(tabPage.pages['Foobar'].frame, text='Bar', style='C.TLabel').pack()
-+ Label(tabPage.pages['Baz'].frame, text='Baz').pack()
-+ entryPgName=Entry(root)
-+ buttonAdd=Button(root, text='Add Page',
-+ command=lambda:tabPage.add_page(entryPgName.get()))
-+ buttonRemove=Button(root, text='Remove Page',
-+ command=lambda:tabPage.remove_page(entryPgName.get()))
-+ labelPgName=Label(root, text='name of page to add/remove:')
-+ buttonAdd.pack(padx=5, pady=5)
-+ buttonRemove.pack(padx=5, pady=5)
-+ labelPgName.pack(padx=5)
-+ entryPgName.pack(padx=5)
-+ root.mainloop()
Index: Lib/idlelib/dynOptionMenuWidget.py
===================================================================
---- Lib/idlelib/dynOptionMenuWidget.py (revision 63867)
+--- Lib/idlelib/dynOptionMenuWidget.py (revision 63916)
+++ Lib/idlelib/dynOptionMenuWidget.py (working copy)
-@@ -2,34 +2,38 @@
+@@ -2,34 +2,41 @@
OptionMenu widget modified to allow dynamic menu reconfiguration
and setting of highlightthickness
"""
@@ -2241,18 +1659,23 @@
value - initial value to set the optionmenu's menubutton to
"""
- self['menu'].delete(0,'end')
-+ menu = self['menu']
-+ menu.delete(0,'end')
- for item in valueList:
+- for item in valueList:
- self['menu'].add_command(label=item,
-- command=_setit(self.variable,item,self.command))
-+ menu.add_command(label=item,
-+ command=_setit(self.variable,item,self.command))
- if value:
- self.variable.set(value)
++ if TTK:
++ self.set_menu(valueList[0], *valueList[1:])
++ else:
++ menu = self['menu']
++ menu.delete(0,'end')
++ for item in valueList:
++ menu.add_command(label=item,
+ command=_setit(self.variable,item,self.command))
+- if value:
+- self.variable.set(value)
++ if value:
++ self.variable.set(value)
Index: Lib/idlelib/MultiStatusBar.py
===================================================================
---- Lib/idlelib/MultiStatusBar.py (revision 63867)
+--- Lib/idlelib/MultiStatusBar.py (revision 63916)
+++ Lib/idlelib/MultiStatusBar.py (working copy)
@@ -1,5 +1,9 @@
from Tkinter import *
More information about the Python-checkins
mailing list