gnue-pos/src Config.py Handler.py frontends/wx/...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-pos
Branch:         
Changes by:     Jason Cater <address@hidden>    03/07/02 21:56:35

Modified files:
        src            : Config.py Handler.py 
        src/frontends/wx: Driver.py 
Added files:
        src/frontends/wx: NumberDisplay.py 

Log message:
        UI work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/Config.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/Handler.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/frontends/wx/NumberDisplay.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/frontends/wx/Driver.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue-pos/src/Config.py
diff -c gnue-pos/src/Config.py:1.4 gnue-pos/src/Config.py:1.5
*** gnue-pos/src/Config.py:1.4  Wed Jul  2 11:13:06 2003
--- gnue-pos/src/Config.py      Wed Jul  2 21:56:35 2003
***************
*** 92,95 ****
--- 92,116 ----
      'Typecast'   :  GTypecast.text,
      'Default'    : 'Item Code' },
  
+   { 'Name'       : 'CompanyName',
+     'Type'       : 'Setting',
+     'Comment'    : '',
+     'Description': '',
+     'Typecast'   :  GTypecast.text,
+     'Default'    : 'GNU Enterprise' },
+ 
+   { 'Name'       : 'CompanyPhone',
+     'Type'       : 'Setting',
+     'Comment'    : '',
+     'Description': '',
+     'Typecast'   :  GTypecast.text,
+     'Default'    : '' },
+ 
+   { 'Name'       : 'CompanyLogo',
+     'Type'       : 'Setting',
+     'Comment'    : '',
+     'Description': '',
+     'Typecast'   :  GTypecast.text,
+     'Default'    : '' },
+ 
  )
Index: gnue-pos/src/Handler.py
diff -c gnue-pos/src/Handler.py:1.2 gnue-pos/src/Handler.py:1.3
*** gnue-pos/src/Handler.py:1.2 Wed Jul  2 11:13:06 2003
--- gnue-pos/src/Handler.py     Wed Jul  2 21:56:35 2003
***************
*** 50,55 ****
--- 50,56 ----
  
      self.__taxTotal = 0
      self.__subTotal = 0
+     self.__payments = 0
  
      self.registerEventListeners( {
              'BeginTicket': self._BeginTicket,
***************
*** 263,271 ****
--- 264,274 ----
      self.__ticket = event.serial
      self.__taxTotal = 0
      self.__subTotal = 0
+     self.__payments = 0
      self.dispatchEvent('UpdateTotal', field="subtotal", amount=0.0)
      self.dispatchEvent('UpdateTotal', field="tax", amount=0.0)
      self.dispatchEvent('UpdateTotal', field="total", amount=0.0)
+     self.dispatchEvent('UpdateTotal', field="balance", amount=0.0)
  
    def _EndTicket(self, event):
      event.dispatchAfter('RequestSKU')
***************
*** 279,287 ****
      if event.taxable:
        self.__taxTotal += event.extended
  
      self.dispatchEvent('UpdateTotal', field="subtotal", 
amount=self.__subTotal)
!     self.dispatchEvent('UpdateTotal', field="tax", 
amount=round(self.__taxTotal* self.__TaxRate,2))
!     self.dispatchEvent('UpdateTotal', field="total", amount=self.__subTotal + 
round(self.__taxTotal* self.__TaxRate,2))
  
    def _CancelTicketItem(self, event):
      pass
--- 282,292 ----
      if event.taxable:
        self.__taxTotal += event.extended
  
+     tax = round(self.__taxTotal* self.__TaxRate,2)
      self.dispatchEvent('UpdateTotal', field="subtotal", 
amount=self.__subTotal)
!     self.dispatchEvent('UpdateTotal', field="tax", amount=tax)
!     self.dispatchEvent('UpdateTotal', field="total", amount=self.__subTotal + 
tax)
!     self.dispatchEvent('UpdateTotal', field="balance", amount=self.__subTotal 
+ tax - self.__payments)
  
    def _CancelTicketItem(self, event):
      pass
Index: gnue-pos/src/frontends/wx/Driver.py
diff -c gnue-pos/src/frontends/wx/Driver.py:1.7 
gnue-pos/src/frontends/wx/Driver.py:1.8
*** gnue-pos/src/frontends/wx/Driver.py:1.7     Wed Jul  2 11:13:06 2003
--- gnue-pos/src/frontends/wx/Driver.py Wed Jul  2 21:56:35 2003
***************
*** 41,52 ****
  
  from wxPython.wx import *
  from wxPython.gizmos import *
  
  class Driver(BaseDriver):
    def init(self):
      self.totalFields = (  ('subtotal',_('Subtotal')),
                            ('tax','%s Sales Tax' % (gConfig('TaxState'))),
!                           ('total',_('Total')) )
  
      self.receiptColumns = ( ('department',_('Dept'), '%s', 0),
                              ('sku',_('Code'), '%s', 0),
--- 41,54 ----
  
  from wxPython.wx import *
  from wxPython.gizmos import *
+ from NumberDisplay import NumberDisplay, bigFont
  
  class Driver(BaseDriver):
    def init(self):
      self.totalFields = (  ('subtotal',_('Subtotal')),
                            ('tax','%s Sales Tax' % (gConfig('TaxState'))),
!                           ('total',_('Total')),
!                           ('balance',_('Balance')) )
  
      self.receiptColumns = ( ('department',_('Dept'), '%s', 0),
                              ('sku',_('Code'), '%s', 0),
***************
*** 163,177 ****
  
      for name, descr in self.totalFields:
        totalSizer.Add(wxStaticText(totalPanel, -1, descr + ': '), 0, 
wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 2)
!       field = wxTextCtrl(totalPanel,-1, style=wxTE_RIGHT|wxTE_READONLY)
        totalSizer.Add(field, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 2)
        self.totalFieldMapping[name] = field
  
-     bigFont = self.totalFieldMapping['total'].GetFont()
-     bigFont.SetWeight(wxBOLD)
-     bigFont.SetPointSize(bigFont.GetPointSize()*1.25)
-     self.totalFieldMapping['total'].SetFont(bigFont)
- 
      entryPanel = wxPanel(bottomPanel, -1)
      entrySizer = wxBoxSizer(wxVERTICAL)
      entryPanel.SetSizer(entrySizer)
--- 165,174 ----
  
      for name, descr in self.totalFields:
        totalSizer.Add(wxStaticText(totalPanel, -1, descr + ': '), 0, 
wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 2)
!       field = NumberDisplay(totalPanel, name=='total')
        totalSizer.Add(field, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 2)
        self.totalFieldMapping[name] = field
  
      entryPanel = wxPanel(bottomPanel, -1)
      entrySizer = wxBoxSizer(wxVERTICAL)
      entryPanel.SetSizer(entrySizer)
***************
*** 180,185 ****
--- 177,183 ----
      self.inputField = wxTextCtrl(entryPanel, -1)
      self.inputLabel.SetFont(bigFont)
      self.inputField.SetFont(bigFont)
+     self.inputField.SetSize((self.inputField.GetSizeTuple()[0],30))
      entrySizer.Add(self.inputLabel, 0, wxEXPAND|wxALIGN_LEFT)
      entrySizer.Add(self.inputField, 0, wxEXPAND|wxALIGN_LEFT)
  
***************
*** 207,213 ****
  
      frameSizer.Layout()
  #    self.frame.ShowFullScreen(1)
!     frame.SetSize((640,480))  # TODO: Maximize to screen?
      frame.Show(1)
  
      EVT_KEY_DOWN(self.inputField, self.__keypress)
--- 205,211 ----
  
      frameSizer.Layout()
  #    self.frame.ShowFullScreen(1)
!     frame.SetSize((800,600))  # TODO: Maximize to screen?
      frame.Show(1)
  
      EVT_KEY_DOWN(self.inputField, self.__keypress)