From d2c4c025a8ce9749952bb6e975787a723ac9b98a Mon Sep 17 00:00:00 2001 From: Mark Mine Date: Fri, 1 Aug 2003 16:59:12 +0000 Subject: [PATCH] Updated to use column instead of col --- direct/src/tkpanels/TaskManagerPanel.py | 8 ++++---- direct/src/tkwidgets/Dial.py | 10 +++++----- direct/src/tkwidgets/Floater.py | 6 +++--- direct/src/tkwidgets/Slider.py | 10 +++++----- direct/src/tkwidgets/WidgetPropertiesDialog.py | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/direct/src/tkpanels/TaskManagerPanel.py b/direct/src/tkpanels/TaskManagerPanel.py index 4355ff5908..6a30a24b73 100644 --- a/direct/src/tkpanels/TaskManagerPanel.py +++ b/direct/src/tkpanels/TaskManagerPanel.py @@ -82,12 +82,12 @@ class TaskManagerWidget(PandaObject): self.removeButton = Button(controlsFrame, text = 'Remove Task', command = self.removeCurrentTask) #self.removeButton.pack(expand = 1, fill = X, side = LEFT) - self.removeButton.grid(row = 0, col = 0, sticky = EW) + self.removeButton.grid(row = 0, column = 0, sticky = EW) self.removeMatchingButton = Button(controlsFrame, text = 'Remove Matching Tasks', command = self.removeMatchingTasks) #self.removeMatchingButton.pack(expand = 1, fill = X, side = LEFT) - self.removeMatchingButton.grid(row = 0, col = 1, sticky = EW) + self.removeMatchingButton.grid(row = 0, column = 1, sticky = EW) self.taskMgrVerbose = IntVar() self.taskMgrVerbose.set(1) @@ -96,14 +96,14 @@ class TaskManagerWidget(PandaObject): text = 'Update', command = self.updateTaskListBox) #self.update.pack(expand = 1, fill = X, side = LEFT) - self.update.grid(row = 1, col = 0, sticky = EW) + self.update.grid(row = 1, column = 0, sticky = EW) self.dynamicUpdate = Checkbutton( controlsFrame, text = 'Dynamic Update', variable = self.taskMgrVerbose, command = self.toggleTaskMgrVerbose) #self.dynamicUpdate.pack(expand = 1, fill = X, side = LEFT) - self.dynamicUpdate.grid(row = 1, col = 1, sticky = EW) + self.dynamicUpdate.grid(row = 1, column = 1, sticky = EW) # Pack frames controlsFrame.pack(fill = X) controlsFrame.grid_columnconfigure(0, weight = 1) diff --git a/direct/src/tkwidgets/Dial.py b/direct/src/tkwidgets/Dial.py index dc4c60303f..24916e9e99 100644 --- a/direct/src/tkwidgets/Dial.py +++ b/direct/src/tkwidgets/Dial.py @@ -53,14 +53,14 @@ class Dial(Valuator): self._valuator.grid(rowspan = 2, columnspan = 2, padx = 2, pady = 2) if self._label: - self._label.grid(row = 0, col = 2, sticky = EW) - self._entry.grid(row = 1, col = 2, sticky = EW) + self._label.grid(row = 0, column = 2, sticky = EW) + self._entry.grid(row = 1, column = 2, sticky = EW) self.interior().columnconfigure(2, weight = 1) else: if self._label: - self._label.grid(row=0,col=0, sticky = EW) - self._entry.grid(row=0,col=1, sticky = EW) - self._valuator.grid(row=0,col=2, padx = 2, pady = 2) + self._label.grid(row=0,column=0, sticky = EW) + self._entry.grid(row=0,column=1, sticky = EW) + self._valuator.grid(row=0,column=2, padx = 2, pady = 2) self.interior().columnconfigure(0, weight = 1) def addValuatorPropertiesToDialog(self): diff --git a/direct/src/tkwidgets/Floater.py b/direct/src/tkwidgets/Floater.py index 9012b0a68b..fdbeb6457b 100644 --- a/direct/src/tkwidgets/Floater.py +++ b/direct/src/tkwidgets/Floater.py @@ -36,9 +36,9 @@ class Floater(Valuator): def packValuator(self): # Position components if self._label: - self._label.grid(row=0,col=0, sticky = EW) - self._entry.grid(row=0,col=1, sticky = EW) - self._valuator.grid(row=0,col=2, padx = 2, pady = 2) + self._label.grid(row=0,column=0, sticky = EW) + self._entry.grid(row=0,column=1, sticky = EW) + self._valuator.grid(row=0,column=2, padx = 2, pady = 2) self.interior().columnconfigure(0, weight = 1) diff --git a/direct/src/tkwidgets/Slider.py b/direct/src/tkwidgets/Slider.py index 32ce3bc545..052a0fb70a 100644 --- a/direct/src/tkwidgets/Slider.py +++ b/direct/src/tkwidgets/Slider.py @@ -57,16 +57,16 @@ class Slider(Valuator): def packValuator(self): if self['style'] == VALUATOR_FULL: if self._label: - self._label.grid(row = 0, col = 0, sticky = EW) - self._entry.grid(row = 0, col = 1, sticky = EW) + self._label.grid(row = 0, column = 0, sticky = EW) + self._entry.grid(row = 0, column = 1, sticky = EW) self._valuator.grid(row = 1, columnspan = 2, padx = 2, pady = 2, sticky = 'ew') self.interior().columnconfigure(0, weight = 1) else: if self._label: - self._label.grid(row=0,col=0, sticky = EW) - self._entry.grid(row=0,col=1, sticky = EW) - self._valuator.grid(row=0,col=2, padx = 2, pady = 2) + self._label.grid(row=0,column=0, sticky = EW) + self._entry.grid(row=0,column=1, sticky = EW) + self._valuator.grid(row=0,column=2, padx = 2, pady = 2) self.interior().columnconfigure(0, weight = 1) def setMin(self): diff --git a/direct/src/tkwidgets/WidgetPropertiesDialog.py b/direct/src/tkwidgets/WidgetPropertiesDialog.py index 81685abb62..8fd2c47a5e 100644 --- a/direct/src/tkwidgets/WidgetPropertiesDialog.py +++ b/direct/src/tkwidgets/WidgetPropertiesDialog.py @@ -88,11 +88,11 @@ class WidgetPropertiesDialog(Toplevel): helpString = propertySet.get('help', None) # Create label label = Label(master, text=property, justify=LEFT) - label.grid(row=count, col = 0, padx=5, sticky=W) + label.grid(row=count, column = 0, padx=5, sticky=W) # Create entry entry = Pmw.EntryField(master, entry_justify = 'right') - entry.grid(row=count, col = 1, padx=5, sticky=W+E) + entry.grid(row=count, column = 1, padx=5, sticky=W+E) if initialvalue is None: entry.insert(0, 'None') else: