gnue common/utils/setup-win4lin-stage.sh forms/...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/03 18:27:16

Modified files:
        common/utils   : setup-win4lin-stage.sh 
        forms/src/uidrivers/qt: ToolBar.py 

Log message:
        * Synching machines

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/utils/setup-win4lin-stage.sh.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/ToolBar.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/common/utils/setup-win4lin-stage.sh
diff -c gnue/common/utils/setup-win4lin-stage.sh:1.3 
gnue/common/utils/setup-win4lin-stage.sh:1.4
*** gnue/common/utils/setup-win4lin-stage.sh:1.3        Tue Apr  2 17:18:21 2002
--- gnue/common/utils/setup-win4lin-stage.sh    Mon Mar  3 18:27:16 2003
***************
*** 2,16 ****
  
  # Unix filesystem settings
  CVSSOURCE=~/cvs/gnue
! PYSOURCE=~/cvs/gnue/.cvsdevelbase 
  CONFSOURCE=~/gnue
  DEST=~/h
  STAGEDIR=stage
  
! # Windows filesystem settings 
  # (you will need to handle filemapping in Windows)
  WINBASE="h:"
! WINEXE="c:\\Python21\\python"
  
  # Convenience functions... do not change
  STAGE=${DEST}/${STAGEDIR}
--- 2,16 ----
  
  # Unix filesystem settings
  CVSSOURCE=~/cvs/gnue
! PYSOURCE=~/cvs/gnue/.cvsdevelbase
  CONFSOURCE=~/gnue
  DEST=~/h
  STAGEDIR=stage
  
! # Windows filesystem settings
  # (you will need to handle filemapping in Windows)
  WINBASE="h:"
! WINEXE="c:\\Python22\\python"
  
  # Convenience functions... do not change
  STAGE=${DEST}/${STAGEDIR}
***************
*** 19,47 ****
  
  WINSTAGE=${WINBASE}\\${STAGEDIR}
  
! mkdir $DEST/bin >> setup-cvs.log 2>&1 
  mkdir $DEST/cvs >> setup-cvs.log 2>&1
  
  rm -rf $DEST/cvs/gnue
  ln -s $CVSSOURCE $DEST/cvs/gnue
  
  
! echo 
! echo "Creating Python staging area at ${STAGE} [${WINSTAGE}]..." 
  rm -rf $STAGE
  mkdir $STAGE
  cd $STAGE
! mkdir `(cd $PYSOURCE; find . -xtype d)` >> setup-cvs.log 2>&1 
! mkdir `(cd $PYSOURCE; find . -xtype d -follow)` >> setup-cvs.log 2>&1  
  for f in `(cd $PYSOURCE; find . -name '*.py' -follow)`
  do
    ln -s $PYSOURCE/$f $f
! done 
  
! mkdir $DEST/gnue >> setup-cvs.log 2>&1 
! mkdir $DEST/gnue/etc >> setup-cvs.log 2>&1 
! rm -f $DEST/gnue/etc/*.conf 
! rm -rf $DEST/gnue/shared 
  ln -s $CONFSOURCE/etc/*.conf $DEST/gnue/etc/
  ln -s $CONFSOURCE/shared $DEST/gnue/shared
  
--- 19,47 ----
  
  WINSTAGE=${WINBASE}\\${STAGEDIR}
  
! mkdir $DEST/bin >> setup-cvs.log 2>&1
  mkdir $DEST/cvs >> setup-cvs.log 2>&1
  
  rm -rf $DEST/cvs/gnue
  ln -s $CVSSOURCE $DEST/cvs/gnue
  
  
! echo
! echo "Creating Python staging area at ${STAGE} [${WINSTAGE}]..."
  rm -rf $STAGE
  mkdir $STAGE
  cd $STAGE
! mkdir `(cd $PYSOURCE; find . -xtype d)` >> setup-cvs.log 2>&1
! mkdir `(cd $PYSOURCE; find . -xtype d -follow)` >> setup-cvs.log 2>&1
  for f in `(cd $PYSOURCE; find . -name '*.py' -follow)`
  do
    ln -s $PYSOURCE/$f $f
! done
  
! mkdir $DEST/gnue >> setup-cvs.log 2>&1
! mkdir $DEST/gnue/etc >> setup-cvs.log 2>&1
! rm -f $DEST/gnue/etc/*.conf
! rm -rf $DEST/gnue/shared
  ln -s $CONFSOURCE/etc/*.conf $DEST/gnue/etc/
  ln -s $CONFSOURCE/shared $DEST/gnue/shared
  
***************
*** 58,79 ****
  echo
  
  echo Creating ${WINBASE}\\bin\\gfcvs.bat...
! echo "$BATBASE ${WINSTAGE}\\gnue\\forms\\GFClient.py %1 %2 %3 %4 %5 %6 %7 %8 
%9${CR}" > $DEST/bin/gfcvs.bat 
  
  echo Creating ${WINBASE}\\bin\\gfdes.bat...
! echo "$BATBASE ${WINSTAGE}\\gnue\\designer\\Designer.py %1 %2 %3 %4 %5 %6 %7 
%8 %9${CR}" > $DEST/bin/gfdes.bat 
  
  echo Creating ${WINBASE}\\bin\\gncvs.bat...
! echo "$BATBASE ${WINSTAGE}\\gnue\\navigator\\GNClient.py %1 %2 %3 %4 %5 %6 %7 
%8 %9${CR}" > $DEST/bin/gncvs.bat 
  
  echo Creating ${WINBASE}\\bin\\grcvs.bat...
! echo "$BATBASE ${WINSTAGE}\\gnue\\reports\\GRRun.py %1 %2 %3 %4 %5 %6 %7 %8 
%9${CR}" > $DEST/bin/grcvs.bat 
  
  
  echo
  echo "-----------------------------------------------------------------------"
! echo 
! echo "You may want to add ${WINBASE}\\bin to your Windows 9x PATH." 
  echo
  echo "If you plan to use the Python command in windows to test code, you may"
  echo "want to add 'set PYTHONPATH=${WINSTAGE}' to your autoexec.bat file"
--- 58,79 ----
  echo
  
  echo Creating ${WINBASE}\\bin\\gfcvs.bat...
! echo "$BATBASE ${WINSTAGE}\\gnue\\forms\\GFClient.py %1 %2 %3 %4 %5 %6 %7 %8 
%9${CR}" > $DEST/bin/gfcvs.bat
  
  echo Creating ${WINBASE}\\bin\\gfdes.bat...
! echo "$BATBASE ${WINSTAGE}\\gnue\\designer\\Designer.py %1 %2 %3 %4 %5 %6 %7 
%8 %9${CR}" > $DEST/bin/gfdes.bat
  
  echo Creating ${WINBASE}\\bin\\gncvs.bat...
! echo "$BATBASE ${WINSTAGE}\\gnue\\navigator\\GNClient.py %1 %2 %3 %4 %5 %6 %7 
%8 %9${CR}" > $DEST/bin/gncvs.bat
  
  echo Creating ${WINBASE}\\bin\\grcvs.bat...
! echo "$BATBASE ${WINSTAGE}\\gnue\\reports\\client\\GRRun.py %1 %2 %3 %4 %5 %6 
%7 %8 %9${CR}" > $DEST/bin/grcvs.bat
  
  
  echo
  echo "-----------------------------------------------------------------------"
! echo
! echo "You may want to add ${WINBASE}\\bin to your Windows 9x PATH."
  echo
  echo "If you plan to use the Python command in windows to test code, you may"
  echo "want to add 'set PYTHONPATH=${WINSTAGE}' to your autoexec.bat file"
Index: gnue/forms/src/uidrivers/qt/ToolBar.py
diff -c gnue/forms/src/uidrivers/qt/ToolBar.py:1.1 
gnue/forms/src/uidrivers/qt/ToolBar.py:1.2
*** gnue/forms/src/uidrivers/qt/ToolBar.py:1.1  Sun Mar  2 13:46:31 2003
--- gnue/forms/src/uidrivers/qt/ToolBar.py      Mon Mar  3 18:27:16 2003
***************
*** 34,62 ****
  class ToolBar(_BaseToolBar):
  
    # Create the menu
!   def init(self): 
      self.toolbar = QToolBar("GNUe Toolbar", self.container)
      return self.toolbar
  
    # Add a menu item (action)
    def addAction(self, name, userAction):
      iconloc = userAction.getIconLocation(size="32x32")
!           
      # Set the action icon if available
!     if iconloc: 
        try: 
          # Some caching logic for faster second/third forms
          icon = _cachedIcons[iconloc]
!       except KeyError: 
          icon = QIconSet(QPixmap(iconloc))
          _cachedIcons[iconloc] = icon
!     else: 
        print "** WARNING: Cannot add '%s' to toolbar; no icon" % 
userAction.event
!     
      button = QToolButton(self.toolbar, name)
      button.setIconSet(icon)
!     button.setTextLabel(name) 
!     if userAction.canToggle: 
        button.setToggleButton(1)
        
      return button
--- 34,64 ----
  class ToolBar(_BaseToolBar):
  
    # Create the menu
!   def init(self):
      self.toolbar = QToolBar("GNUe Toolbar", self.container)
+     self.toolbar.show()
      return self.toolbar
  
    # Add a menu item (action)
    def addAction(self, name, userAction):
      iconloc = userAction.getIconLocation(size="32x32")
! 
      # Set the action icon if available
!     if iconloc:
        try: 
          # Some caching logic for faster second/third forms
          icon = _cachedIcons[iconloc]
!       except KeyError:
          icon = QIconSet(QPixmap(iconloc))
          _cachedIcons[iconloc] = icon
!     else:
        print "** WARNING: Cannot add '%s' to toolbar; no icon" % 
userAction.event
!       return
! 
      button = QToolButton(self.toolbar, name)
      button.setIconSet(icon)
!     button.setTextLabel(name)
!     if userAction.canToggle:
        button.setToggleButton(1)
        
      return button