r6330 - in trunk/gnue-designer: images src src/base src/base/docks src/base/startup src/base/tools

[jcater]

Author: jcater
Date: 2004-09-17 16:36:44 -0500 (Fri, 17 Sep 2004)
New Revision: 6330

Added:
   trunk/gnue-designer/images/gnue-designer.png
   trunk/gnue-designer/src/base/Goat.py
Modified:
   trunk/gnue-designer/src/Designer.py
   trunk/gnue-designer/src/base/Instance.py
   trunk/gnue-designer/src/base/docks/FloatingPane.py
   trunk/gnue-designer/src/base/startup/Startup.py
   trunk/gnue-designer/src/base/tools/TriggerEditor.py
Log:
added a goat icon by lekma

Added: trunk/gnue-designer/images/gnue-designer.png
===================================================================
(Binary files differ)


Property changes on: trunk/gnue-designer/images/gnue-designer.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/gnue-designer/src/Designer.py
===================================================================
--- trunk/gnue-designer/src/Designer.py 2004-09-17 12:00:50 UTC (rev 6329)
+++ trunk/gnue-designer/src/Designer.py 2004-09-17 21:36:44 UTC (rev 6330)
@@ -40,7 +40,7 @@
 _import_indent = 0
 
 import __builtin__
-__builtin__.__dict__['StartupStatus'] = lambda string:string
+__builtin__.__dict__['gStartupStatus'] = lambda string:string
 
 class MyModuleLoader(ihooks.ModuleLoader):
 
@@ -123,7 +123,7 @@
     # Init the splashscreen
     from base.startup import Startup
     self.startup = Startup()
-    StartupStatus(_('Initializing Client Library'))
+    gStartupStatus(_('Initializing Client Library'))
 
     if len(self.ARGUMENTS):
       for arg in self.ARGUMENTS:
@@ -287,7 +287,7 @@
 
   def loadModuleInformation(self):
 
-    StartupStatus(_('Loading available tool modules'))
+    gStartupStatus(_('Loading available tool modules'))
 
     self.supportedModuleObjects = []
     self.supportedOpenWildcard = ""
@@ -346,7 +346,7 @@
   #
   def load(self, file):
 
-    StartupStatus(_('Loading document'))
+    gStartupStatus(_('Loading document'))
 
     extension = string.lower(os.path.splitext(file)[1][1:])
 

Added: trunk/gnue-designer/src/base/Goat.py
===================================================================
--- trunk/gnue-designer/src/base/Goat.py        2004-09-17 12:00:50 UTC (rev 
6329)
+++ trunk/gnue-designer/src/base/Goat.py        2004-09-17 21:36:44 UTC (rev 
6330)
@@ -0,0 +1,104 @@
+#----------------------------------------------------------------------
+# This file was generated by /usr/bin/img2py
+#
+from wxPython.wx import wxImageFromStream, wxBitmapFromImage
+from wxPython.wx import wxEmptyIcon
+import cStringIO
+
+
+def getGoatData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x000\x00\x00\x000\x08\x06\x00\
+\x00\x00W\x02\xf9\x87\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x07\xe9IDATx\x9c\xed\x9akl\x14\xd7\x15\xc7\x7f\xf7\xce\xeez_\xde]l\xec\x82\
+\r\xb6y\x83i\x01\x13JS\xa0\x80\x1b\x954AU!\xa5!)J\xab\xa8$\xd0\xa6\xd04R\xa8\
+*U\xad\xd4\xa8\xea#\xb4\xa9\xaa>TT\xbe\x14)\x12\xb4U\xa4V\xadJ\x85\x14(\rj\
+\xe3\xa8\x80BR\x88!\t\xc6\x18\xbc~\xacm\xec}\xce\xcc\xed\x07\xdb\xb0\xb33;\
+\xbb^\x07E\x91z\xbexv\xf7\xce\x99\xdf\xff>\xce9\xf7\x8e\x85\x90\x1a\x1fd\x93\
+\xef7\xc0t\xed\x03/\xc0S\xec\x07e\x1aJ\x08\x89R&R\xf3"\xa5\x17\x10 \x9cZ\x8b\
+"\x1f\xc7/\x94\xad\xb9\xa3\x13\x8b\x1fS\xcf\xa0\xf44BzP\xa6\x89\x90\xce7\t\
+\xe75 \x94\xa6\xf9hhZO(:\x07\x9f?\x86\x12\x12%%\x08\x89\x12b\xfc\xaf\x94(1\
+\xf9]\xfe\xef\x93\xd7\xe2\xce\xefE\xdb\x16\xf7\xa5\x8f\r\x90\x89_d\xb8\xe3\
+\x08*\x97\x04\xd3\xb0\x89p\x10 T$:\x97\xa6\x05[\x90^?R\xd3\xa8\xab\x9bA0\x1c\
address@hidden \x955Hg\rR\x19\x83\x8ca\xa2\x1b` \xc6\xc1\xf3\x81*\x80\xcf\
+\xbfVz\x8a\xc4\xc9\x9f\x93\xb9~\xd6&\xc2"@\x99\x86\xf2x\x83,[\xf9\x18U\xc1\
+\x10\xcb[[hn\xaaGh\x1a\xe9L\x8e\x81\xa1$\x89\xe1\x14\x89\xd1\x14\xa3\xc9\x1c\
+\xa9\x8c\x8e\xae\x84\xe5\x81\xa5\xe0\x176\xd7\xb2\xf7\xb3m4\xd6\x85\xa9\x8d\
address@hidden&~t\x0ffj\
+\xc42\x9d<\x05jhhZ\x8f\xf4\xfaY\xb3z1\x1fnm&1\x92\xe4\xcd\xce\x1e:\xdf\x8d\
+\x93\xce\x18\xae\xbd\xe5\x06\x1f\xad\x0e\xf0\xf4\xa3k\xf9\xc2\xa7Z\xd1\xa4u&\
+\x18\xa6bVM\x90\xc5sb\xf4\x8f\xea\xbc\xd1=b\xf3\x85?L\xf5\xba\xdd\x0c\xbf\
+\xfc3\xf2W\x95E\x80R&\xa1\xe8\x1c\x10\x92\x95\x1f\x99\x87\xf4h\xfc\xe5\xc49F\
+S\xb92\xa6Bqx\xbf\xdf\xc7\x1f~\xf0\x10\xf3fG-\xe0c\xe9\x1c\xdf\xfd\xddk\xbc\
+\xf4\xaf.t%h\xa8\r\xd103\xcc\xe2\xc6(]\x83)\x929e\xf1\xe5mX\x01\xa6\x0ey\xb3\
+\xc6"@j^|\xfe\x18\xb5\xb5Q\xa2\xd1\x10]=\x83e\xc2K\xd7i\xf3\xad/\xad\xb3\xc1\
+\x03\x9c\x7f{\x80\x07\xd66\xb1\xf73\xcbi\xae\x0b\xe3\xf5X\xa3\xfa\xdb\xbdc<\
+\xfb\xe2\x05^\xe9L\x80\x90\xc8\xc8l\x847\x80\xca\xa5\x94\x90\x9a\x80\x82< \
+\xa5\x17%$\xf5\xf51|U^\xde\xed\x1e\x986\xfc\xa6\xd5M\xec\xda\xd2j\x83\x07X\
+\xd7:\x8b\xfbV5\xb2pv\xc4\x06\x0f0\xffC!\x8e<\xb5\x869\xb5\xa1\xdb\xcf\x15^\
+\xbf\xa5MA\x1e\x18\x9f\n\xa1p\x00\xaf\xd7\xc3\xd5\xee\x81i\xc1{<\x1a\xcf=\
+\xb1\xd1\x11>\xdfr\xba\xc9\x99\x8b}\xfc\xf5\xdc\r\x8e\x9f\xebe8m\x10\x0c\xf8\
+\x08\xfa\xbd\x04\xab\xbcd\x0cu;,\x17\xe6\x1c["SR\x12\n\x07\xf0\xf9\xbc\xc4\
+\x13cS\x0b\x7f\xc2\xba\xa0\xb7m^Bc]\xd8\x15\xfe\xad\xeb#\xec<x\x9a\xf8h\xce\
+\xd2\x11\xa91\x9d\x81\xa4\x89\x129kN)0\xab\x00\x01JH"\x91\x10\xe9\xacN*kT\
+\x14\xbb\x11\x02\xe9\xd1\xf8\xea\xb6U\xee\xf0=#<|\xf04}\xf9\xf0\xc2\xc9\xef\
+\x9d\x84Xh\xf6o\x84$R\x1d\xa4?1Z1\xbc\x92\x92\xad\xeb\x16\xd2<+R\x14\xbeo8\
+\xcd\xce\x83\xff\xb4\xc3\x97\xc8\xe6\x85U\x8bM\x80\x92\x92p\xd8O\xdf\xe0X\
+\xc5\xf0H\xc9S\xdb\xdd{\xff\xf0\x89+\xc4oe\xa7^\x8a\x94\x1a\x01%$R\xd3\xe8\
+\x1d\x18\xad\x08^\t\xc9\xfdk\xe7\xb1hN\xac(|*kp\xe4\xf4\xd5\x8a\xea\xa8\x12\
+\x02\xc6A\xa5\x94\xf4\x0e\x8eV\x04\x8f\x90|\xadD\xef\xff\xfeL\x17\x89\xa4^Y\
+\x11X0\x87\x8a\x8c\x80\xa4/\x91\xac\x08\xbe}u\x13\xcb[j\\\x05\x0c%u"A_e\x15\
+\xac\xfb\x08p\xdbI<16e\xf8`\xc0\xc7\x81G\xeeq\x85\x07\xd8\xff\xe0"\xce?\xbf\
+\x85_\xefn\xa3\xbd\xb5\x0e!\xb5\xb2\xcb\xefB\xb3oh\x84$1\x92&\xab\xab)\xc1KM\
+\xe3\x97_\xdf\xcc\xd2\xb9\xc5\xe7~\xbeUy%\xdb\xd6\xccf\xdb\x9a\xd9\xdc\x18\
+\xca\xf0\xec\xb1K\x1c\x7f3Q:\xf3\xbb\n\x10\xa0\x84\xe0\xe6\xc4\x02.\x17>\xe0\
+\xf7\xf1\xe3\xbd\x1b\xd8\xbc\xb2\xb1,\xf8|\xd3M\xc5+\x97\x87x+\x9e.\xablq\
+\x17\x00 $\xd7\xfbn\x95\r\xdf\xd2\x10\xe37\xdfhg\xb1K\xd4q\xb2\x9c\xa1\xf8\
+\xed\xa9k\x1c:\xd5M\xf7\xb0[\xc1(,k\xb1\xd0lQHIIW\xefH\x91\x1e\xb0\xc2\x0b\
+\xa9\xf1\x8b}\x9b\xa6\x0c\x0f\xe0\xd5\x04/_J\x94\x01_\xb8&\xca\x88B\xfd\xc3\
+\xa9\xb2\x92\xd8\x8e\xf6E%#\x8e\x9b\xfdd\xe7\x12B~\xef\x14\xe0K\x8c\x80\x02\
+\x10\x12\x93\xd2\xf0\xc1`\x15\x07>\xdfV1<\xc0\xdc\x1a?\xdf\xdb6\xdfV\x04\xba\
address@hidden:\
+\xc7\xf55\xad<\xe0\xe6\xa4eV\x94/\xdf\xbft\xda\xf0\x93\xf6\xc2\x8e\xf9,\xa8\
+\x0b\x94u\x92QR@)x)5\x9e\x7f\xe2\xe3\x8e;\xa8J-\xe4\x93|\xe7\xc19%\xe1\x95\
+\xc3\x86\xc6J1\xb1\x1fps\xf2\xf8\xa7\x97\xb2vI\xdd{\x06?i[[c,\x98\x19p\x87/=\
+\x02\xee\xb5\xcf\xfc\x86\x18\x07v\xac|\xcf\xe1a\xfc\xbcl\xdf\xc6:W\xf8\xb2\
+\xd7\x80\x93\x13\xa9i\xfc\xf4\xc9{\xf1\xfb\xee\xdeq\xfc#\xabfP_]X\xe4\x15tjI\
+\x01E2\xf0c\xf7-\xa2mA\xed]\x83\x07\xf0{\x04O~\xac\xc65\x84\x97\xdc\x919\xc1\
+{<\x1a{\xb7.\xbb\xab\xf0\x93\xb6\xfb\xa3Q\x02^\xadh\x08/4\xfb\xa9D\x01<B\xb0\
+\xac\xb9\x86\x86\x9a\xa0\xeb\x83s\x86\xc9\xa1\x93\xd7\xe8\x19\xce\xd2?\xaaS\
+\x13\xf6\xb1u\xc5L6,address@hidden>;V$\x0f\xb8\x1e\xab\
+8\x1f\xd4\xc6G2\xf4\x0c\xa6h\xa8\t\x14}\xf0\xf7\xfft\x85_\x9d\xec\xb6<\xf0?\
+\xd7S\x1c\xdf75\x01\x00\xdf\xdc0\x83c\x173\x0cg\xb1\xcf\x88\x82\xb6\x8e\xd5h\
+aV\xbc1\x94a\xe3\xb7O\xb0\xbce\x06\x19]\xd1X\x1b\xe2\xf0\x9e\xd5\xb7o\xc9\
+\xea&/\xbez\xd3\xd6[\xaf\xf7\xa4\xc8\x1a\n\x9fV\xec\x85\x86\xb35F4\x9ek\x8f\
+\xb1\xff\xef#\xf6\x19Q`\x0e\x8b\xd8\xe1\xa0VH\x92\xba\xa2\xe3\xca\x10\xe7\
+\xbbn\xd1?\x9a\xb3\xdcs\xe6\xf2\x10\x89\x94i\xeb\xad\xb4\x01\x17z\x92S\x82\
+\x9f\xb4\xddm!>\xd1\xec\xb7\xcd\x08W\x01\xa6\x9e)\xb9\x8dTRR\x1d\xf4Z\x9c\
+\x9c\xf8o\xa2h\xf9\xddqm\xac"\x01\x028\xb6=\xc6\'[\xaa,\x9dJ\xd6\xea\xcfZ\
+\x8d\xeair\xc9\x01\xd7\xcd\x0cB\x10\t\xfal\x02\x8a\xc5\xee\x8ek\xa9\x8a\x04\
+\x00\xc4\xaa\x04\x7f~(\xc2\x0f7\x85\x98\x19\xd2P\x89n\xc8\x8c1y2m\x13 \xa4\
+\x87L\xfcR\xc9\x9dX\xd8\x7fg\xe9\\\x1dHs\xb9?S4v\xbf\xd6]\xb9\x00\x00\x8f\
+\x84g\xee\xa9\xa2\xf3\xf10\x0f\xd7\xf7\x82f\x1d}\xeb\x08\x98&\xc3\x1dG0\xf5\
+\xb4\xeb6\xf2oo\x0c\x92\xcc\x1a\xc0D\xef\xbb\x94\xdf\xef$t\xfa\xc7\x8ci\x89\
+\x00\x88\'M\x8e\xff\xe8+\xe3/8\xf2\xcc\xfe\x92Oj\xaa\xaa\xb1\x8dX\xfb3P\x15\
+\xb2\xaf\x89\x89\xebH\xc0GVA\xca\x00\x85{\x05{tW\x13\x0f,q?\xa5v\xb3dN\xb1~\
+\xd7\xd3\x9c{\xe9\x10\xc2\xccYV\xb2=.\x99\x86\xc8\\?K\xfc\xe8\x1eR\x9d\'\xd1\
+\xc7\xfa\x1c\xe1\x863&I\xbd4<B\xf2jw\xba"\xf0\x91\x8c\xc9\x1f;\xdea\xcd\xfa\
+\x8d\x8e\xf0\xe04\x02\x13\xa6L\xa5\x90\x12L\x1d\xe1\rL\xbc\x19\xc9\xbb\xdf\
+\xfa\xb2\xd3\xfe2{\xdc;\x00\xa1`\x88\xfa\xba\xda\xdbm\xadm\x9c}dF\x87\xb8q\
+\xf5\nJz\xc6\x19\x84tL&E\x05X\xc5\x18\x8e|w\xdb\xf2\xa3M\xd16\xff\xffo\x95\
+\xf7\xd9\xfe\x07 \xf45f\x18k\x97o\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getGoatBitmap():
+    return wxBitmapFromImage(getGoatImage())
+
+def getGoatImage():
+    stream = cStringIO.StringIO(getGoatData())
+    return wxImageFromStream(stream)
+
+def getGoatIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getGoatBitmap())
+    return icon
+

Modified: trunk/gnue-designer/src/base/Instance.py
===================================================================
--- trunk/gnue-designer/src/base/Instance.py    2004-09-17 12:00:50 UTC (rev 
6329)
+++ trunk/gnue-designer/src/base/Instance.py    2004-09-17 21:36:44 UTC (rev 
6330)
@@ -46,6 +46,7 @@
 from PrimaryToolBar import PrimaryToolBar
 from gnue.designer import VERSION, PACKAGE
 from ModuleSupport import SupportedModules
+from gnue.designer.base import Goat
 
 TITLE=PACKAGE
 
@@ -111,6 +112,9 @@
     wxFrame.__init__(self, NULL, -1, "")
     EventController.__init__(self)
 
+    icon = Goat.getGoatIcon()
+    self.SetIcon(icon)
+
     # During startup, we will cache all events
     # so we can execute them when everything has
     # been initialized.
@@ -208,10 +212,10 @@
     self.SetToolBar(self.toolbar)
 
 
-    StartupStatus(_('Inventorying Document Objects'))
+    gStartupStatus(_('Inventorying Document Objects'))
     self.rootObject.walk(self.__inventory)
 
-    StartupStatus(_('Creating User Interface'))
+    gStartupStatus(_('Creating User Interface'))
 
     # Create the supplemental tools
     self._toolCache = []

Modified: trunk/gnue-designer/src/base/docks/FloatingPane.py
===================================================================
--- trunk/gnue-designer/src/base/docks/FloatingPane.py  2004-09-17 12:00:50 UTC 
(rev 6329)
+++ trunk/gnue-designer/src/base/docks/FloatingPane.py  2004-09-17 21:36:44 UTC 
(rev 6330)
@@ -34,6 +34,7 @@
 from gnue.common.apps import GDebug
 from BasePane import BasePane
 from gnue.designer.base.ToolBar import BaseToolBar, getIcon
+from gnue.designer.base import Goat
 
 #
 # Any tool frames inherit from this
@@ -51,6 +52,9 @@
     wxFrame.__init__(self, instance, -1, tool.title, style=style)
     BasePane.__init__(self, parent, instance, tool)
 
+    icon = Goat.getGoatIcon()
+    self.SetIcon(icon)
+
     if tool.uses_feedback_bar:
       self.statusbar = self.CreateStatusBar()
 

Modified: trunk/gnue-designer/src/base/startup/Startup.py
===================================================================
--- trunk/gnue-designer/src/base/startup/Startup.py     2004-09-17 12:00:50 UTC 
(rev 6329)
+++ trunk/gnue-designer/src/base/startup/Startup.py     2004-09-17 21:36:44 UTC 
(rev 6330)
@@ -5,7 +5,7 @@
 import __builtin__
 from gnue.common.apps import GConfig
 
-__builtin__.__dict__['StartupStatus'] = lambda string:string
+__builtin__.__dict__['gStartupStatus'] = lambda string:string
 
 splashloc = 
os.path.join(GConfig.getInstalledBase('designer_images','common_images') 
,'designer', 'splash.png')
 splashbitmap = wxImage(splashloc,
@@ -13,7 +13,7 @@
 
 class Startup(wxSplashScreen):
   def __init__(self):
-    __builtin__.__dict__['StartupStatus'] = self.startupStatus
+    __builtin__.__dict__['gStartupStatus'] = self.startupStatus
     wxSplashScreen.__init__(self, splashbitmap,
        wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_NO_TIMEOUT,400, None, -1,
        style=wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP)
@@ -24,13 +24,13 @@
 
   def pauseAndClose(self):
     self.Raise()
-    StartupStatus('Finalizing Settings')
+    gStartupStatus('Finalizing Settings')
     MyTimer(self.setSettingsText).Start(100)
     self.timer = MyTimer(self.destroy).Start(1000)
 
   def setSettingsText(self):
     # Fscking, bastardized GTK piece of damn crap
-    StartupStatus('Finalizing Settings')
+    gStartupStatus('Finalizing Settings')
 
   def destroy(self, event=None):
     self.hide()
@@ -42,7 +42,7 @@
     except:
       pass
     self.timer = None
-    __builtin__.__dict__['StartupStatus'] = lambda string:string
+    __builtin__.__dict__['gStartupStatus'] = lambda string:string
     self.Show(0)
 
   def startupStatus(self, text):

Modified: trunk/gnue-designer/src/base/tools/TriggerEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/TriggerEditor.py 2004-09-17 12:00:50 UTC 
(rev 6329)
+++ trunk/gnue-designer/src/base/tools/TriggerEditor.py 2004-09-17 21:36:44 UTC 
(rev 6330)
@@ -371,8 +371,7 @@
     EVT_KEY_DOWN(self, self.OnKeyPressed)
 
 
-  def OnKeyPressed(self, event):    
-    print "press"
+  def OnKeyPressed(self, event):
     key = event.KeyCode()
     if key == 32 and event.ControlDown():
       pos = self.GetCurrentPos()
@@ -415,7 +414,7 @@
     if self.InEditMode:
       self.instance.makeDirty()
       self.parent.object._children[0]._content = self.GetText()
-      
+
   def OnUpdateUI(self, evt):
     # check for matching braces
     braceAtCaret = -1