gnue-designer/src base/PrimaryToolBar.py base/T...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-designer
Branch:         
Changes by:     Jason Cater <address@hidden>    03/08/13 19:43:08

Modified files:
        src/base       : PrimaryToolBar.py ToolBar.py 
        src/forms/LayoutEditor: LayoutEditorTools.py ReorderFocus.py 
                                WidgetFocusTab.py 

Log message:
        little more code on tab order mode + odd cleanups

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/base/PrimaryToolBar.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/base/ToolBar.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/forms/LayoutEditor/ReorderFocus.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/forms/LayoutEditor/WidgetFocusTab.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue-designer/src/base/PrimaryToolBar.py
diff -c gnue-designer/src/base/PrimaryToolBar.py:1.5 
gnue-designer/src/base/PrimaryToolBar.py:1.6
*** gnue-designer/src/base/PrimaryToolBar.py:1.5        Thu May 29 01:07:22 2003
--- gnue-designer/src/base/PrimaryToolBar.py    Wed Aug 13 19:43:07 2003
***************
*** 28,35 ****
  
  from gnue.designer.base.ToolBar import BaseToolBar
  
! ToolbarMapping = 'RequestNewForm,tb_new;'   \
!                + 'RequestOpen,tb_open;' \
                 + 'RequestSave,tb_save;' \
                 + 'RequestSaveAs,tb_save_as;' \
                 + ';' \
--- 28,35 ----
  
  from gnue.designer.base.ToolBar import BaseToolBar
  
! ToolbarMapping = 'RequestNewForm,tb_new,pulldown;'   \
!                + 'RequestOpen,tb_open,pulldown;' \
                 + 'RequestSave,tb_save;' \
                 + 'RequestSaveAs,tb_save_as;' \
                 + ';' \
***************
*** 39,58 ****
  class PrimaryToolBar(BaseToolBar):
  
    def init(self):
!     self.registerEventListeners( {'MakeDirty' : self.onDirtyForm,
!                                   'MakeClean' : self.onCleanForm, } )
      self.addToolbarMapping(ToolbarMapping)
  
  
!   def onDirtyForm(self, event):
      try:
!       self.EnableTool(self.mapping['File|Save'],1)
      except KeyError:
        pass
  
  
!   def onCleanForm(self, event):
      try:
!       self.EnableTool(self.mapping['File|Save'],0)
      except KeyError:
        pass
--- 39,58 ----
  class PrimaryToolBar(BaseToolBar):
  
    def init(self):
!     self.registerEventListeners( {'MakeDirty' : self.onDirty,
!                                   'MakeClean' : self.onClean, } )
      self.addToolbarMapping(ToolbarMapping)
  
  
!   def onDirty(self, event):
      try:
!       self.EnableTool(self.mapping['RequestSave'],1)
      except KeyError:
        pass
  
  
!   def onClean(self, event):
      try:
!       self.EnableTool(self.mapping['RequestSave'],0)
      except KeyError:
        pass
Index: gnue-designer/src/base/ToolBar.py
diff -c gnue-designer/src/base/ToolBar.py:1.7 
gnue-designer/src/base/ToolBar.py:1.8
*** gnue-designer/src/base/ToolBar.py:1.7       Tue Aug 12 18:45:13 2003
--- gnue-designer/src/base/ToolBar.py   Wed Aug 13 19:43:08 2003
***************
*** 61,68 ****
        if not len(type):
          self.AddSeparator()
        else:
!         handle, image  = string.split(type,',',1)
! 
  
          help=""
  ##        help = self.instance.menubar.getEventHelp(handle)
--- 61,72 ----
        if not len(type):
          self.AddSeparator()
        else:
!         try:
!           handle, image, options  = string.split(type,',',2)
!           options = options.lower().split()
!         except:
!           handle, image  = string.split(type,',',1)
!           options = ()
  
          help=""
  ##        help = self.instance.menubar.getEventHelp(handle)
***************
*** 74,79 ****
--- 78,87 ----
          id = wxNewId()
          self.mapping[id] = handle
          self.mapping[handle] = id
+ 
+ 
+         if 'pulldown' in options:
+           print "Erm, I don't yet support pulldown toolbar buttons (%s)" % 
handle
  
          self.AddTool(id,
            getIcon(image, *self.ICON_SIZE),
Index: gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.29 
gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.30
*** gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.29      Tue Aug 
12 18:45:13 2003
--- gnue-designer/src/forms/LayoutEditor/LayoutEditorTools.py   Wed Aug 13 
19:43:08 2003
***************
*** 30,36 ****
  
  
  ToolbarMapping = 'LayoutEditor:Select,tb_select;' \
!                + 'LayoutEditor:FocusOrder,tb_reorder;' \
                 + ';' \
                 + 'Wizard:AddBlock,wizard_block;' \
                 + 'Wizard:AddPage,wizard_page;' \
--- 30,36 ----
  
  
  ToolbarMapping = 'LayoutEditor:Select,tb_select;' \
!                + 'LayoutEditor:FocusOrder,tb_reorder,pulldown;' \
                 + ';' \
                 + 'Wizard:AddBlock,wizard_block;' \
                 + 'Wizard:AddPage,wizard_page;' \
Index: gnue-designer/src/forms/LayoutEditor/ReorderFocus.py
diff -c gnue-designer/src/forms/LayoutEditor/ReorderFocus.py:1.1 
gnue-designer/src/forms/LayoutEditor/ReorderFocus.py:1.2
*** gnue-designer/src/forms/LayoutEditor/ReorderFocus.py:1.1    Tue Aug 12 
18:45:13 2003
--- gnue-designer/src/forms/LayoutEditor/ReorderFocus.py        Wed Aug 13 
19:43:08 2003
***************
*** 28,34 ****
  
  import sys, string
  from gnue.common.apps import GDebug
! 
  #
  #
  #
--- 28,34 ----
  
  import sys, string
  from gnue.common.apps import GDebug
! from WidgetFocusTab import WidgetFocusTab
  #
  #
  #
***************
*** 39,45 ****
    def start(self, page):
      self.list = []
      self.page = page
!     print "I am SOOO there, dude!"
  
    def end(self):
!     pass
--- 39,59 ----
    def start(self, page):
      self.list = []
      self.page = page
!     self.page.walk(self._buildList)
! 
!     i = 0
!     for tab in self.list:
!       tab.setOrder(i)
!       i += 1
! 
!   def _buildList(self, object):
!     # TODO: More intelligence
!     # TODO: allow only cycling thru current block, selection, or page
!     if object._type in ('GFEntry','GFButton'):
!       self.list.append(WidgetFocusTab(self.instance, object))
  
    def end(self):
!     for object in self.list:
!       object.close()
!     self.list = []
! 
Index: gnue-designer/src/forms/LayoutEditor/WidgetFocusTab.py
diff -c gnue-designer/src/forms/LayoutEditor/WidgetFocusTab.py:1.1 
gnue-designer/src/forms/LayoutEditor/WidgetFocusTab.py:1.2
*** gnue-designer/src/forms/LayoutEditor/WidgetFocusTab.py:1.1  Tue Aug 12 
18:45:13 2003
--- gnue-designer/src/forms/LayoutEditor/WidgetFocusTab.py      Wed Aug 13 
19:43:08 2003
***************
*** 38,44 ****
  #
  #
  class WidgetFocusTab:
!   def __init__(self, parent):
!     pass
  
  
--- 38,58 ----
  #
  #
  class WidgetFocusTab:
!   def __init__(self, instance, widget):
!     self.instance = instance
!     panel = self.instance.visualEditor.panel
!     self.widget = widget
!     x, y = widget._widgetHandler.widget.GetPositionTuple()
!     print x,y
!     self.label = wxStaticText(panel, -1, "0", pos=(x,y-10))
  
+   def setOrder(self, position):
+     self.position = position
+     self.label.SetLabel("%s" % (position+1))
+     print "Setting order to %s" % (position+1)
+ 
+   def close(self):
+     self.instance = None
+     self.widget = None
+ ##    self.Destroy()