--- nfo/projects/netfraggle/bin/fraggleViewport.py	2004/08/26 23:10:12	1.11
+++ nfo/projects/netfraggle/bin/fraggleViewport.py	2004/08/27 00:05:22	1.12
@@ -1,7 +1,10 @@
 #Boa:MDIParent:fraggleViewport
 
-# $Id: fraggleViewport.py,v 1.11 2004/08/26 23:10:12 xabbu Exp $
+# $Id: fraggleViewport.py,v 1.12 2004/08/27 00:05:22 joko Exp $
 # $Log: fraggleViewport.py,v $
+# Revision 1.12  2004/08/27 00:05:22  joko
+# fix for icon-path and wxTaskBarIcon-events
+#
 # Revision 1.11  2004/08/26 23:10:12  xabbu
 # xmlrpc class added
 #
@@ -18,6 +21,7 @@
 from wxPython.wx import *
 from wxPython.stc import *
 
+from fraggleConstants import *
 import fraggleDialogPrefs
 import fraggleCtlPreferences
 import FraggleAboutDialog
@@ -27,9 +31,7 @@
 def create(parent):
     return fraggleViewport(parent)
 
-[wxID_FRAGGLEVIEWPORT, wxID_FRAGGLEVIEWPORTBUTTONSYNC, 
- wxID_FRAGGLEVIEWPORTSTYLEDTEXTCTRL1, 
-] = map(lambda _init_ctrls: wxNewId(), range(3))
+[wxID_FRAGGLEVIEWPORT] = map(lambda _init_ctrls: wxNewId(), range(1))
 
 [wxID_FRAGGLEVIEWPORTMENU1FPREFS, wxID_FRAGGLEVIEWPORTMENU1ITEMS1, 
 ] = map(lambda _init_coll_menu1_Items: wxNewId(), range(2))
@@ -71,34 +73,24 @@
         self.menuBar1.SetAutoLayout(1)
 
         self.menu1 = wxMenu(title='')
-        self._init_coll_menu1_Items(self.menu1)
 
         self.menu2 = wxMenu(title='')
-        self._init_coll_menu2_Items(self.menu2)
 
         self._init_coll_menuBar1_Menus(self.menuBar1)
+        self._init_coll_menu1_Items(self.menu1)
+        self._init_coll_menu2_Items(self.menu2)
 
     def _init_ctrls(self, prnt):
         # generated method, don't edit
         wxMDIParentFrame.__init__(self, id=wxID_FRAGGLEVIEWPORT,
-              name='fraggleViewport', parent=prnt, pos=wxPoint(525, 292),
-              size=wxSize(341, 296),
+              name='fraggleViewport', parent=prnt, pos=wxPoint(338, 296),
+              size=wxSize(435, 296),
               style=wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
               title='NetFraggle 0.0.1')
         self._init_utils()
-        self.SetClientSize(wxSize(341, 273))
+        self.SetClientSize(wxSize(427, 269))
         self.SetMenuBar(self.menuBar1)
 
-        self.buttonsync = wxButton(id=wxID_FRAGGLEVIEWPORTBUTTONSYNC,
-              label='Sync', name='buttonsync', parent=self, pos=wxPoint(104,
-              240), size=wxSize(136, 24), style=0)
-        EVT_BUTTON(self.buttonsync, wxID_FRAGGLEVIEWPORTBUTTONSYNC,
-              self.OnButtonsyncButton)
-
-        self.styledTextCtrl1 = wxStyledTextCtrl(id=wxID_FRAGGLEVIEWPORTSTYLEDTEXTCTRL1,
-              name='styledTextCtrl1', parent=self, pos=wxPoint(8, 16),
-              size=wxSize(328, 216), style=0)
-
     def __init_preferences__(self):
         self.preferencesCtl = fraggleCtlPreferences.create(self)
         self.dialogPrefs = fraggleDialogPrefs.create(self)
@@ -119,11 +111,15 @@
             pass
         elif os.name == 'nt':
             self.tbicon = wxTaskBarIcon()
-            icon = wxIcon('mixxx.ico', wxBITMAP_TYPE_ICO)
+            #icon = wxIcon('mixxx.ico', wxBITMAP_TYPE_ICO)
+            icon = wxIcon(os.path.join(APPLOCATION, 'mixxx.ico'), wxBITMAP_TYPE_ICO)
             self.tbicon.SetIcon(icon, '')
-            wxEVT_TASKBAR_LEFT_DCLICK(self.tbicon, self.OnTaskBarLeftDClick)
-            wxEVT_TASKBAR_RIGHT_UP(self.tbicon, self.OnTaskBarRightClick)
-    
+            EVT_TASKBAR_LEFT_DCLICK(self.tbicon, self.OnTaskBarLeftDClick)
+            EVT_TASKBAR_RIGHT_UP(self.tbicon, self.OnTaskBarRightClick)
+            
+        #EVT_BUTTON(self.updateButton, wxID_FRAGGLETOPICFRAMEUPDATEBUTTON,
+        #      self.OnUpdateButtonButton)
+                  
     def __init__(self, parent):
         self._init_ctrls(parent)
         self.__init_preferences__()
@@ -156,7 +152,9 @@
         dlg.Destroy()
 
     def OnTaskBarLeftDClick(self, event):
-        event.Skip()
+        #event.Skip()
+        #self.SetFocus()
+        self.Restore()
         
     def OnTaskBarRightClick(self, event):
         event.Skip()
@@ -164,10 +162,6 @@
     def OnButtonsyncButton(self, event):
         fragglexml = self.xml_rpc.FraggleSync()
         print fragglexml
-        import codecs
-        (UTF8_encode, UTF8_decode,
-            UTF8_streamreader, UTF8_streamwriter) = codecs.lookup('UTF-8')        
-        text = UTF8_decode(repr(fragglexml))[0]
-        text = fragglexml.data
-        self.styledTextCtrl1.AddText(text)
-        event.Skip()
\ No newline at end of file
+        #text = fragglexml.data
+        self.styledTextCtrl1.AddText(fragglexml)
+        event.Skip()