gnue/forms/src/uidrivers/gtk2 UIdriver.py

[Arturas Kriukovas]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Arturas Kriukovas <address@hidden>      02/08/28 11:02:44

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

Log message:
        Now it should work with current forms client version.

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

Patches:
Index: gnue/forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.4 
gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.5
*** gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.4       Wed Aug 28 09:39:17 2002
--- gnue/forms/src/uidrivers/gtk2/UIdriver.py   Wed Aug 28 11:02:44 2002
***************
*** 165,171 ****
      global _charWidth
      _charWidth = self.charWidth             # Used by the mouse handler to 
compute char offset into widget
  
- 
      self.menu_sb_space=4 # the extra spaces needed by the menu, toolbar and 
statusbar
  
  
--- 165,170 ----
***************
*** 253,259 ****
  
  
      toolbar=gtk.Toolbar()
- 
      items = [ ('SAVE_CHANGES', '', 0, 0, ''),
                ('INSERT_RECORD','',0,0,''),
                ('DELETE_RECORD','',0,0,''),
--- 252,257 ----
***************
*** 282,288 ****
        print 'failed to load SAVE_CHANGES logo for toolbar'
  
  
- 
      pixbuf = gtk.gdk.pixbuf_new_from_file (images_dir+gConfig('tb_insert'))
        # Register icon to accompany stock item
      if pixbuf:
--- 280,285 ----
***************
*** 305,311 ****
  
  
  
- 
      pixbuf = gtk.gdk.pixbuf_new_from_file (images_dir+gConfig('tb_first'))
        # Register icon to accompany stock item
      if pixbuf:
--- 302,307 ----
***************
*** 488,494 ****
  
      table.attach(toolbar,0,1,1,2,gtk.EXPAND |gtk.FILL,0,0,0)
  
- 
      main_frame=gtk.Frame()
      table.attach(main_frame,0,1,2,3,gtk.EXPAND|gtk.FILL,0,0,0)
      self.currentWidget=[main_frame]
--- 484,489 ----
***************
*** 859,870 ****
        pass
  
  
!   def createWidget(self, object, container, textWidth, textHeight,
!                    widgetWidth, widgetHeight, interface, spacer,initialize=1):
!     newWidget = self._createWidget(object, container, textWidth, textHeight,
!                                    widgetWidth, widgetHeight, interface, 
spacer,initialize)
      #$initFont(newWidget)
!     self._addToCrossRef(newWidget,object,self)
      return newWidget
  
  
--- 854,863 ----
        pass
  
  
!   def createWidget(self, event, spacer):
!     newWidget = self._createWidget(event, spacer)
      #$initFont(newWidget)
!     self._addToCrossRef(newWidget, event.object, self)
      return newWidget
  
  
***************
*** 895,907 ****
                       'right' : gtk.JUSTIFY_RIGHT,
                     }
  
!   def _createWidget(self, object, container, textWidth, textHeight, 
widgetWidth,
!                    widgetHeight,interface,spacer,initialize=1):
      newWidget = gtk.Label(str(object.text))
!     newWidget.set_size_request(self.itemWidth,self.itemHeight)
!     
container.put(newWidget,object.x*widgetWidth,(object.y+spacer+(spacer*object._gap))*widgetHeight)
      newWidget.set_justify(self.alignmentStyle[object.alignment])
!     container.show_all()
      return newWidget
  
  
--- 888,902 ----
                       'right' : gtk.JUSTIFY_RIGHT,
                     }
  
!   def _createWidget(self, event, spacer):
!     object = event.object
! 
      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
  
  
***************
*** 916,923 ****
  # Widget set specific function that creates a single instance of a border box
  #
  class UIBox(UIHelper, UIWidget):
!   def _createWidget(self, object, container, textWidth, textHeight,
!                    widgetWidth, widgetHeight,interface,spacer,initialize=1):
      #$print "inside UIBOX"
      GDebug.printMesg(1, "inside UIBOX")
      return None
--- 911,917 ----
  # Widget set specific function that creates a single instance of a border box
  #
  class UIBox(UIHelper, UIWidget):
!   def _createWidget(self, event, spacer):
      #$print "inside UIBOX"
      GDebug.printMesg(1, "inside UIBOX")
      return None
***************
*** 930,945 ****
  # to navigate multiple records
  #
  class UIScrollBar(UIHelper, UIWidget):
!   def _createWidget(self, object, container, textWidth, 
textHeight,widgetWidth, widgetHeight,interface,spacer,initialize=1):
      #$print object.height*widgetHeight,(object.y+spacer)*widgetHeight
!     GDebug.printMesg(2, "size #1: " + str(object.height*widgetHeight) + ", " 
+str((object.y+spacer)*widgetHeight))
!     adjustment=gtk.Adjustment(70,500,80,2,3,80)
!     newWidget=gtk.VScrollbar(adjustment)
!     
newWidget.set_size_request(object.width*widgetWidth,object.height*widgetHeight)
!     container.put(newWidget,600,60)
      #$print object.x*widgetWidth,(object.y+spacer)*widgetHeight
!     GDebug.printMesg(2, "size #2: " + str(object.x*widgetWidth) + ", " + 
str((object.y+spacer)*widgetHeight))
!     container.show_all()
      #$print "i am in UIScrollBar"
      GDebug.printMesg(1, "i am in UIScrollBar")
      return newWidget
--- 924,944 ----
  # to navigate multiple records
  #
  class UIScrollBar(UIHelper, UIWidget):
!   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")
      return newWidget
***************
*** 955,967 ****
  # Widget set specific function that creates a single instance of a button
  #
  class UIButton(UIHelper, UIWidget):
!   def _createWidget(self, object, container, textWidth, textHeight,
!                    widgetWidth, widgetHeight,interface,spacer,initialize=1):
!     newWidget =gtk.Button(str(object.label))
!     
newWidget.set_size_request(object.x*widgetWidth,(object.y+spacer)*widgetHeight)
!     
container.put(newWidget,object.x*widgetWidth,(object.y+spacer)*widgetHeight)
!     if initialize:
!       newWidget.connect('clicked',self.buttonHandler,newWidget)
        #_setDefaultEventHandlers(newWidget,initialize)
  
      return newWidget
--- 954,969 ----
  # Widget set specific function that creates a single instance of a button
  #
  class UIButton(UIHelper, UIWidget):
!   def _createWidget(self, event, spacer):
!     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)
  
      return newWidget
***************
*** 987,1005 ****
  # Note: The event trap for changing notebook pages is attached to the UIForm
  #
  class UIPage(UIHelper, UIWidget):
!   def _createWidget(self, object, container, textWidth, textHeight,
!                    widgetWidth, widgetHeight,interface,spacer,initialize=1):
      if _NOTEBOOK:
        newWidget = gtk.Fixed()
!       tab_label=gtk.Label(object.name)
!       _NOTEBOOK.append_page(newWidget,tab_label)
      else:
        newWidget = gtk.Fixed()
        _SINGLEPAGE.add(newWidget)
  
      #$_setDefaultEventHandlers(newWidget,initialize)
  
!     interface._pageList.append(newWidget)
      return newWidget
  
  
--- 989,1006 ----
  # Note: The event trap for changing notebook pages is attached to the UIForm
  #
  class UIPage(UIHelper, UIWidget):
!   def _createWidget(self, event, spacer):
      if _NOTEBOOK:
        newWidget = gtk.Fixed()
!       tab_label=gtk.Label(event.object.name)
!       _NOTEBOOK.append_page(newWidget, tab_label)
      else:
        newWidget = gtk.Fixed()
        _SINGLEPAGE.add(newWidget)
  
      #$_setDefaultEventHandlers(newWidget,initialize)
  
!     event.interface._pageList.append(newWidget)
      return newWidget
  
  
***************
*** 1016,1028 ****
  #
  
  class UIEntry(UIHelper, UIWidget):
!   def _createWidget(self, object, container, textWidth, textHeight,
!                    widgetWidth, widgetHeight,interface,spacer,initialize=1):
! 
      style = object.style
  
      if style == 'dropdown':
!       if initialize:
          self.choices = object.allowedValues().values()
        else:
          self.choices = [""]
--- 1017,1028 ----
  #
  
  class UIEntry(UIHelper, UIWidget):
!   def _createWidget(self, event, spacer):
!     object = event.object
      style = object.style
  
      if style == 'dropdown':
!       if event.initialize:
          self.choices = object.allowedValues().values()
        else:
          self.choices = [""]
***************
*** 1030,1054 ****
        self.choices.sort()
        newWidget = gtk.Combo()
        newWidget.set_popdown_strings(self.choices)
!       newWidget.set_size_request(self.itemWidth,self.itemHeight)
!       
container.put(newWidget,object.x*widgetWidth,(object.y+spacer+(object._gap*spacer))*widgetHeight)
!       newWidget.list.connect('select-child',self.comboHandler,newWidget)
  
        #$print self.comboHandlerID
!       _setDefaultEventHandlers(newWidget.entry,initialize,newWidget)
!       _setDefaultEventHandlers(newWidget.list,initialize,newWidget)
  
      elif style == 'label':
!       newWidget =gtk.Label("")
!       newWidget.set_size_request(self.itemWidth,self.itemHeight+1)
!       
container.put(newWidget,object.x*widgetWidth,(object.y+spacer+(object._gap*spacer))*widgetHeight)
!       _setDefaultEventHandlers(newWidget,initialize,newWidget)
  
      elif style == 'checkbox':
        newWidget = gtk.CheckButton()
!       newWidget.set_size_request(2*textWidth,textHeight)
!       
container.put(newWidget,object.x*widgetWidth,(object.y+spacer+(object._gap*spacer))*widgetHeight)
!       newWidget.connect('toggled',self.checkboxHandler,newWidget)
  
        #$_setDefaultEventHandlers(newWidget,initialize,newWidget)
  
--- 1030,1057 ----
        self.choices.sort()
        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
!       _setDefaultEventHandlers(newWidget.entry, event.initialize, newWidget)
!       _setDefaultEventHandlers(newWidget.list, event.initialize, newWidget)
  
      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)
  
***************
*** 1060,1070 ****
        #$newWidget.set_buffer(textBuffer)
        #$textBuffer.set_text(value)
        newWidget=gtk.Entry()
!       newWidget.set_size_request(self.itemWidth,self.itemHeight+1)
!       
container.put(newWidget,object.x*widgetWidth,(object.y+spacer+(object._gap*spacer))*widgetHeight)
!       _setDefaultEventHandlers(newWidget,initialize,newWidget)
  
!     container.show_all()
      return newWidget
  
  
--- 1063,1074 ----
        #$newWidget.set_buffer(textBuffer)
        #$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()
      return newWidget
  
  
***************
*** 1106,1132 ****
                 'top':gtk.POS_TOP,
                }
  
!   def _createWidget(self, object, container, textWidth, textHeight,
!                    widgetWidth, widgetHeight,interface,spacer,initialize=1):
      global _NOTEBOOK, _SINGLEPAGE
  
!     if object.tabbed:
!       tabstyle =self.tabStyles[object.tabbed]
        newWidget = gtk.Notebook()
        newWidget.set_tab_pos(tabstyle)
!       interface.currentWidget[0].add(newWidget)
!       newWidget.connect('switch-page',self.notebookTabHandler,newWidget)
        newWidget.show_all()
        _NOTEBOOK  = newWidget
  
      else:
!       newWidget =gtk.Frame()
!       interface.currentWidget[0].add(newWidget)
        newWidget.show_all()
        _SINGLEPAGE=newWidget
  
!     if initialize:
!       interface.mainWindow.connect('destroy',interface.closeTrap)
  
      return newWidget
  
--- 1110,1135 ----
                 'top':gtk.POS_TOP,
                }
  
!   def _createWidget(self, event, spacer):
      global _NOTEBOOK, _SINGLEPAGE
  
!     if event.object.tabbed:
!       tabstyle = self.tabStyles[event.object.tabbed]
        newWidget = gtk.Notebook()
        newWidget.set_tab_pos(tabstyle)
!       event.interface.currentWidget[0].add(newWidget)
!       newWidget.connect('switch-page', self.notebookTabHandler, newWidget)
        newWidget.show_all()
        _NOTEBOOK  = newWidget
  
      else:
!       newWidget = gtk.Frame()
!       event.interface.currentWidget[0].add(newWidget)
        newWidget.show_all()
        _SINGLEPAGE=newWidget
  
!     if event.initialize:
!       event.interface.mainWindow.connect('destroy', event.interface.closeTrap)
  
      return newWidget