gnue/forms/src/uidrivers curses/UIdriver.py gtk...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/26 22:23:30

Modified files:
        forms/src/uidrivers/curses: UIdriver.py 
        forms/src/uidrivers/gtk2: UIdriver.py 

Log message:
        Changed (without working samples :) the curses and gtk2 driver to new 
format

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/UIdriver.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/UIdriver.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/curses/UIdriver.py
diff -c gnue/forms/src/uidrivers/curses/UIdriver.py:1.24 
gnue/forms/src/uidrivers/curses/UIdriver.py:1.25
*** gnue/forms/src/uidrivers/curses/UIdriver.py:1.24    Mon Nov 25 11:44:18 2002
--- gnue/forms/src/uidrivers/curses/UIdriver.py Tue Nov 26 22:23:30 2002
***************
*** 241,248 ****
      return 1
  
    def activateForm(self, form):
!     width = int(self._form.width)
!     height = int(self._form.height)
  
  ##     formSize = wxSize(width*int(self.widgetWidth),
  ##                       
int(height+self.menu_sb_space)*int(self.widgetHeight))
--- 241,248 ----
      return 1
  
    def activateForm(self, form):
!     width = self._form._layout.Char__width
!     height = self._form._layout.Char__height
  
  ##     formSize = wxSize(width*int(self.widgetWidth),
  ##                       
int(height+self.menu_sb_space)*int(self.widgetHeight))
***************
*** 295,302 ****
    def _updateCreateEvent(self, event):
      event.eventHandler = self.dispatchEvent
      event.ui = self
!     event.formWidth = int(self._form.width)
!     event.formHeight = int(self._form.height)
      event.screenHeight = self._screen.MAXROW - 3
      event.screenWidth = self._screen.MAXCOL
      return event
--- 295,302 ----
    def _updateCreateEvent(self, event):
      event.eventHandler = self.dispatchEvent
      event.ui = self
!     event.formWidth = int(self._form._layout.Char__width)
!     event.formHeight = int(self._form._layout.Char__height)
      event.screenHeight = self._screen.MAXROW - 3
      event.screenWidth = self._screen.MAXCOL
      return event
***************
*** 501,508 ****
    def _createWidget(self, event, spacer):
      object = event.object
      style = self.alignmentStyle[object.alignment]
!     GDebug.printMesg(0,"*****Label Alert!!! (x,y)=(%s,%s) %s" % (object.x, 
object.y,event.container))
!     newWidget = 
Label(event.container,str(self),object.y+spacer,object.x,str(object.text))
      event.container.AddControl(newWidget)
      return newWidget
  
--- 501,508 ----
    def _createWidget(self, event, spacer):
      object = event.object
      style = self.alignmentStyle[object.alignment]
!     GDebug.printMesg(0,"*****Label Alert!!! (x,y)=(%s,%s) %s" % 
(object.Char__x, object.Char__y,event.container))
!     newWidget = 
Label(event.container,str(self),object.Char__y+spacer,object.Char__x,str(object.text))
      event.container.AddControl(newWidget)
      return newWidget
  
***************
*** 514,521 ****
  class UIBox(UIHelper, UIWidget):
    def _createWidget(self, event, spacer):
      object = event.object
!     newWidget = GroupBox(event.container,'name',object.y,object.x,
!                       object.width, object.height,str(object.label))
      event.container.AddControl(newWidget)
      return newWidget
  
--- 514,521 ----
  class UIBox(UIHelper, UIWidget):
    def _createWidget(self, event, spacer):
      object = event.object
!     newWidget = GroupBox(event.container,'name',object.Char__y,object.Char__x,
!                       object.Char__width, 
object.Char__height,str(object.label))
      event.container.AddControl(newWidget)
      return newWidget
  
***************
*** 529,538 ****
    def _createWidget(self, event, spacer):
      object = event.object
  
!     if object.width > 1:
!       newWidget = 
ScrollBar(event.container,'name',object.y,object.x,object.width)
      else:
!       newWidget = 
VScrollBar(event.container,'name',object.y,object.x,object.height)
      event.container.AddControl(newWidget)
      newWidget.Init(10)  ## TODO: This should be the number of rows
      return newWidget
--- 529,538 ----
    def _createWidget(self, event, spacer):
      object = event.object
  
!     if object.Char__width > 1:
!       newWidget = 
ScrollBar(event.container,'name',object.Char__y,object.Char__x,object.Char__width)
      else:
!       newWidget = 
VScrollBar(event.container,'name',object.Char__y,object.Char__x,object.Char__height)
      event.container.AddControl(newWidget)
      newWidget.Init(10)  ## TODO: This should be the number of rows
      return newWidget
***************
*** 545,551 ****
  class UIButton(UIHelper, UIWidget):
    def _createWidget(self, event, spacer):
      object = event.object
!     newWidget = 
Button(event.container,'name',object.y+spacer,object.x,object.width,str(object.label))
      event.container.AddControl(newWidget)
      self.__gf = object
      newWidget.SetMethod("CLICK", self.buttonHandler)
--- 545,551 ----
  class UIButton(UIHelper, UIWidget):
    def _createWidget(self, event, spacer):
      object = event.object
!     newWidget = 
Button(event.container,'name',object.Char__y+spacer,object.Char__x,object.Char__width,str(object.label))
      event.container.AddControl(newWidget)
      self.__gf = object
      newWidget.SetMethod("CLICK", self.buttonHandler)
***************
*** 618,634 ****
          choices = object.allowedValues()[1]
        else:
          choices = [""]
!       newWidget = ComboBox(event.container, 'name',object.y+spacer,object.x, 
object.width)
        for index in range(len(choices)):
          newWidget.AddItem(index,choices[index])
      elif style == 'label':
!       newWidget = TextBox(event.container, 'name', object.y+spacer, object.x, 
object.width)
      elif style == 'checkbox':
!       newWidget = CheckBox(event.container, 
'name',object.y+spacer,object.x,'',0)
!     elif object.height > 1: # Normal text box/Multiline
!       newWidget = TextArea(event.container, 'name', object.y+spacer, 
object.x, object.width, object.height)
      else: # Normal text box
!       newWidget = TextBox(event.container, 'name', object.y+spacer, object.x, 
object.width)
  
      event.container.AddControl(newWidget)
  
--- 618,634 ----
          choices = object.allowedValues()[1]
        else:
          choices = [""]
!       newWidget = ComboBox(event.container, 
'name',object.Char__y+spacer,object.Char__x, object.Char__width)
        for index in range(len(choices)):
          newWidget.AddItem(index,choices[index])
      elif style == 'label':
!       newWidget = TextBox(event.container, 'name', object.Char__y+spacer, 
object.Char__x, object.Char__width)
      elif style == 'checkbox':
!       newWidget = CheckBox(event.container, 
'name',object.Char__y+spacer,object.Char__x,'',0)
!     elif object.Char__height > 1: # Normal text box/Multiline
!       newWidget = TextArea(event.container, 'name', object.Char__y+spacer, 
object.Char__x, object.Char__width, object.Char__height)
      else: # Normal text box
!       newWidget = TextBox(event.container, 'name', object.Char__y+spacer, 
object.Char__x, object.Char__width)
  
      event.container.AddControl(newWidget)
  
Index: gnue/forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.14 
gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.15
*** gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.14      Mon Nov 25 11:44:18 2002
--- gnue/forms/src/uidrivers/gtk2/UIdriver.py   Tue Nov 26 22:23:30 2002
***************
*** 636,643 ****
  
      if not _NOTEBOOK:
        self.visiblePage = self._formToUI[event.data][0]
!       self.visiblePage.set_size_request(self._form.width*self.widgetWidth,
!                                       
(self._form.height+self.menu_sb_space)*self.widgetHeight)
      else:
        self.visiblePage = self._formToUI[event.data][0]
  
--- 636,643 ----
  
      if not _NOTEBOOK:
        self.visiblePage = self._formToUI[event.data][0]
!       
self.visiblePage.set_size_request(self._form._layout.Char__width*self.widgetWidth,
!                                       
(self._form._layout.Char__height+self.menu_sb_space)*self.widgetHeight)
      else:
        self.visiblePage = self._formToUI[event.data][0]
  
***************
*** 910,917 ****
  
      newWidget = gtk.Label(str(object.text))
      newWidget.set_size_request(self.itemWidth, self.itemHeight)
!     event.container.put(newWidget, object.x * event.widgetWidth,
!       (object.y + spacer + (spacer * object._gap)) * event.widgetHeight)
      newWidget.set_justify(self.alignmentStyle[object.alignment])
      event.container.show_all()
      return newWidget
--- 910,917 ----
  
      newWidget = gtk.Label(str(object.text))
      newWidget.set_size_request(self.itemWidth, self.itemHeight)
!     event.container.put(newWidget, object.Char__x * event.widgetWidth,
!       (object.Char__y + spacer + (spacer * object._gap)) * event.widgetHeight)
      newWidget.set_justify(self.alignmentStyle[object.alignment])
      event.container.show_all()
      return newWidget
***************
*** 944,960 ****
    def _createWidget(self, event, spacer):
      object = event.object
  
!     #$print object.height*widgetHeight,(object.y+spacer)*widgetHeight
!     GDebug.printMesg(2, "size #1: " + str(object.height * event.widgetHeight) 
+
!       ", " +str((object.y + spacer) * event.widgetHeight))
      adjustment = gtk.Adjustment(70,500,80,2,3,80)
      newWidget = gtk.VScrollbar(adjustment)
!     newWidget.set_size_request(object.width * event.widgetWidth,
!       object.height * event.widgetHeight)
      event.container.put(newWidget,600,60)
!     #$print object.x*widgetWidth,(object.y+spacer)*widgetHeight
!     GDebug.printMesg(2, "size #2: " + str(object.x * event.widgetWidth) + 
!       ", " + str((object.y + spacer) * event.widgetHeight))
      event.container.show_all()
      #$print "i am in UIScrollBar"
      GDebug.printMesg(1, "i am in UIScrollBar")
--- 944,960 ----
    def _createWidget(self, event, spacer):
      object = event.object
  
!     #$print 
object.Char__height*widgetHeight,(object.Char__y+spacer)*widgetHeight
!     GDebug.printMesg(2, "size #1: " + str(object.Char__height * 
event.widgetHeight) +
!       ", " +str((object.Char__y + spacer) * event.widgetHeight))
      adjustment = gtk.Adjustment(70,500,80,2,3,80)
      newWidget = gtk.VScrollbar(adjustment)
!     newWidget.set_size_request(object.Char__width * event.widgetWidth,
!       object.Char__height * event.widgetHeight)
      event.container.put(newWidget,600,60)
!     #$print object.Char__x*widgetWidth,(object.Char__y+spacer)*widgetHeight
!     GDebug.printMesg(2, "size #2: " + str(object.Char__x * event.widgetWidth) 
+ 
!       ", " + str((object.Char__y + spacer) * event.widgetHeight))
      event.container.show_all()
      #$print "i am in UIScrollBar"
      GDebug.printMesg(1, "i am in UIScrollBar")
***************
*** 975,984 ****
      object = event.object
  
      newWidget = gtk.Button(str(object.label))
!     newWidget.set_size_request(object.x * event.widgetWidth,
!       (object.y + spacer) * event.widgetHeight)
!     event.container.put(newWidget, object.x * event.widgetWidth,
!       (object.y + spacer) * event.widgetHeight)
      if event.initialize:
        newWidget.connect('clicked', self.buttonHandler, newWidget)
        #_setDefaultEventHandlers(newWidget,initialize)
--- 975,984 ----
      object = event.object
  
      newWidget = gtk.Button(str(object.label))
!     newWidget.set_size_request(object.Char__x * event.widgetWidth,
!       (object.Char__y + spacer) * event.widgetHeight)
!     event.container.put(newWidget, object.Char__x * event.widgetWidth,
!       (object.Char__y + spacer) * event.widgetHeight)
      if event.initialize:
        newWidget.connect('clicked', self.buttonHandler, newWidget)
        #_setDefaultEventHandlers(newWidget,initialize)
***************
*** 1048,1055 ****
        newWidget = gtk.Combo()
        newWidget.set_popdown_strings(self.choices)
        newWidget.set_size_request(self.itemWidth, self.itemHeight)
!       event.container.put(newWidget, object.x * event.widgetWidth,
!         (object.y + spacer + (object._gap * spacer)) * event.widgetHeight)
        newWidget.list.connect('select-child', self.comboHandler, newWidget)
  
        #$print self.comboHandlerID
--- 1048,1055 ----
        newWidget = gtk.Combo()
        newWidget.set_popdown_strings(self.choices)
        newWidget.set_size_request(self.itemWidth, self.itemHeight)
!       event.container.put(newWidget, object.Char__x * event.widgetWidth,
!         (object.Char__y + spacer + (object._gap * spacer)) * 
event.widgetHeight)
        newWidget.list.connect('select-child', self.comboHandler, newWidget)
  
        #$print self.comboHandlerID
***************
*** 1059,1073 ****
      elif style == 'label':
        newWidget = gtk.Label("")
        newWidget.set_size_request(self.itemWidth, self.itemHeight + 1)
!       event.container.put(newWidget, object.x * event.widgetWidth,
!         (object.y + spacer + (object._gap * spacer)) * event.widgetHeight)
        _setDefaultEventHandlers(newWidget, event.initialize, newWidget)
  
      elif style == 'checkbox':
        newWidget = gtk.CheckButton()
        newWidget.set_size_request(2 * event.textWidth, event.textHeight)
!       event.container.put(newWidget, object.x * event.widgetWidth,
!         (object.y + spacer + (object._gap * spacer)) * event.widgetHeight)
        newWidget.connect('toggled', self.checkboxHandler, newWidget)
  
        #$_setDefaultEventHandlers(newWidget,initialize,newWidget)
--- 1059,1073 ----
      elif style == 'label':
        newWidget = gtk.Label("")
        newWidget.set_size_request(self.itemWidth, self.itemHeight + 1)
!       event.container.put(newWidget, object.Char__x * event.widgetWidth,
!         (object.Char__y + spacer + (object._gap * spacer)) * 
event.widgetHeight)
        _setDefaultEventHandlers(newWidget, event.initialize, newWidget)
  
      elif style == 'checkbox':
        newWidget = gtk.CheckButton()
        newWidget.set_size_request(2 * event.textWidth, event.textHeight)
!       event.container.put(newWidget, object.Char__x * event.widgetWidth,
!         (object.Char__y + spacer + (object._gap * spacer)) * 
event.widgetHeight)
        newWidget.connect('toggled', self.checkboxHandler, newWidget)
  
        #$_setDefaultEventHandlers(newWidget,initialize,newWidget)
***************
*** 1081,1088 ****
        #$textBuffer.set_text(value)
        newWidget=gtk.Entry()
        newWidget.set_size_request(self.itemWidth, self.itemHeight+1)
!       event.container.put(newWidget, object.x * event.widgetWidth,
!         (object.y + spacer + (object._gap * spacer)) * event.widgetHeight)
        _setDefaultEventHandlers(newWidget, event.initialize, newWidget)
  
      event.container.show_all()
--- 1081,1088 ----
        #$textBuffer.set_text(value)
        newWidget=gtk.Entry()
        newWidget.set_size_request(self.itemWidth, self.itemHeight+1)
!       event.container.put(newWidget, object.Char__x * event.widgetWidth,
!         (object.Char__y + spacer + (object._gap * spacer)) * 
event.widgetHeight)
        _setDefaultEventHandlers(newWidget, event.initialize, newWidget)
  
      event.container.show_all()