Changeset 19624

Timestamp:

09/20/08 00:11:15 (5 years ago)

Author:

showyou

Message:

tab振り分け設定ファイル追加

Location:

lang/python/crochet

Files:

• .chat/tabconfig (added)
• chat_allsrc.py (modified) (7 diffs)

lang/python/crochet/chat_allsrc.py

@@ -42 +42 @@
                 return "",False,False
 
-g_filter = []
+#g_filter = []
 #g_filter.append(BranchFilter("kotesashi","breeziness","",False,False,False,False))
 #g_filter.append(BranchFilter("kotesashi","miz_","",True,False,False,False))
 #g_filter.append(BranchFilter("fav","sak65536","",False,False,False,False))
 
-customPage = [
+#customPage = [
 #       (u"小手指","kotesashi"), 
-        (u"fav","fav"),
-        (u"ゴミ","gomi")
-]
+#       (u"fav","fav"),
+#       (u"ゴミ",u"ゴミ")
+#]
 """画像取得用スレッド"""
 class ImageGetFrame(wx.Frame):
@@ -328 +328 @@
 
 class RecentPage(TmpTwitPage):
-        def __init__(self, parent,threadLock):
+        def __init__(self, parent,threadLock,filter):
                 TmpTwitPage.__init__(self,"Recent",parent,threadLock)
 
@@ -334 +334 @@
                 #self.hiddenDataList = []
                 self.customPages = {}# フィルタリングページの固まり？
-                
+                self.filter = filter
                 if g_growl == True:
                         self.g = Growl.GrowlNotifier(
@@ -388 +388 @@
                                 #       self.customPages[0].InsertData(dataListElement,hiddenDataListElement)
                                 #       flag2 = 1
-                                for f in g_filter:
+                                for f in self.filter:
                                         tabName,moveFrom,setMark = f.doFilter(x[0],x[1]) 
                                         if tabName != "":
@@ -471 +471 @@
         
                                 self.InsertData(dataListElement,hiddenDataListElement)  
-        
+
 class MainFrame(wx.Frame):
         """MainFrame class deffinition.
@@ -496 +496 @@
                 #twUserdata = Pit.get('twitter.com',{'require' : {'user':'','pass':''}})
                 twUserdata = self.loadUserData(".chat/twdata")
+                twTabConfig = self.loadUserData(".chat/tabconfig")
+
                 wx.Frame.__init__(self,None, -1, "crochet")
                 
@@ -508 +510 @@
                 notebook = self.notebook = wx.Notebook(self,-1)
 
-
                 self.imageThreadLock = thread.allocate_lock()
                 self.httpThreadLock = thread.allocate_lock()
-                
-                self.recentPage = RecentPage(self,self.httpThreadLock)
+        
+                filter = []
+                for f in twTabConfig['tabFilter']:
+                        filter.append(BranchFilter(f[0],f[1],f[2],f[3],f[4],f[5],f[6])  )       
+                
+                self.recentPage = RecentPage(self,self.httpThreadLock,filter)
                 self.replyPage = ReplyPage(self,self.httpThreadLock)
                 self.directPage = DMPage(self,self.httpThreadLock) 
 
-                for p in customPage:
-                        page = CustomPage(p[0],self,self.httpThreadLock)
-                        self.recentPage.AppendCustomPage(page,p[1])     
+                for p in twTabConfig['tabName']:
+                        page = CustomPage(p,self,self.httpThreadLock)
+                        self.recentPage.AppendCustomPage(page,p)        
                 
                 inputSizer = wx.BoxSizer(wx.HORIZONTAL)