Changeset 438

Timestamp:

02/15/07 10:39:35 (18 months ago)

Author:

daelstorm

Message:

Murmur: Icons appear in chat room (also hilite icons), private tabs, browse, search, user-info child-tabs; /usearch, /bsearch and /rsearch commands now work, Join/Leave room popups fixed; help dialogs data modified; User stats updated in chatrooms; room list sorting enabled and is fast this time; chatroom userlist sorting enabled; MasterRoom? and Chatrooms classes merged

Location:

murmur/trunk/sources

Files:

• encode_bitmaps.py (modified) (1 diff)
• images/birdies/hilite.png (added)
• murmur (modified) (59 diffs)
• pymurmur/entrydialog.py (modified) (3 diffs)
• pymurmur/imagedata.py (modified) (1 diff)

murmur/trunk/sources/encode_bitmaps.py

@@ -27 +27 @@
         ["close.png", "close"],
         ["logo.png", "logo"],
+        ["hilite.png", "hilite"],       
 ]
-
+path = ""
+if len (sys.argv[1:]) == 1:
+    path = sys.argv[1]
 outf = open(os.path.join("pymurmur","imagedata.py"), "w")
 for image in table:
         print image[0]
-        f = open(os.path.join("images", image[0]), "rb")
+        if os.path.exists(os.path.join(os.path.join("images", path), image[0])):
+            filename = os.path.join(os.path.join("images", path), image[0])
+        else:
+            filename = os.path.join("images", image[0])
+        
+        f = open(filename, "rb")
         d = f.read()
         f.close()

murmur/trunk/sources/murmur

@@ -284 +284 @@
         button.grab_default()
         self.ret = None
+        
     def quit(self, w=None, event=None):
         self.hide()
         self.destroy()
-        #gtk.main_quit()
+        gtk.main_quit()
+        
     def click(self, button):
         self.ret = None
@@ -325 +327 @@
                                         self.frame.userlists.trusted.update(key, value)
                                 if domain in ("banned", "buddies", "ignored", "trusted"):
-                                        self.frame.ChatRooms.roomsmaster.GetListStatus( key)
+                                        self.frame.ChatRooms.GetListStatus( key)
                                         self.frame.userlists.updateListIcon(key)
                                 
@@ -345 +347 @@
                                         self.frame.userlists.trusted.append(key, value)
                                 if domain in ("banned", "buddies", "ignored", "trusted"):
-                                        self.frame.ChatRooms.roomsmaster.GetListStatus( key)
+                                        self.frame.ChatRooms.GetListStatus( key)
                                         self.frame.userlists.updateListIcon(key)
                                         
@@ -373 +375 @@
                                 self.frame.userlists.trusted.remove(key)
                         if domain in ("banned", "buddies", "ignored", "trusted"):
-                                self.frame.ChatRooms.roomsmaster.GetListStatus(key)
+                                self.frame.ChatRooms.GetListStatus(key)
                                 self.frame.userlists.updateListIcon(key)
                         if domain == "interests.hate":
@@ -583 +585 @@
 
                 if DEBUG == True: print " **** cb_room_list", len(roomlist)
-                self.frame.room_lists = {}
-                for x, y in roomlist.items():
-                        self.frame.room_lists[x] = y
-                        #print x, y
-                        
-                self.frame.ChatRooms.roomsmaster.UpdateRoomList(roomlist)
+                #self.frame.room_lists = {}
+                #for x, y in roomlist.items():
+                        #self.chatrooms.rooms[x] = y
+                        ##print x, y
+                        
+                self.frame.ChatRooms.UpdateRoomList(roomlist)
                 gtk.gdk.threads_leave()
 
@@ -604 +606 @@
                 gtk.gdk.threads_enter()
                 
-                if DEBUG == True: print " **** cb_search_ticket"
+                if DEBUG == True: print " **** cb_search_ticket", query, ticket
                 self.frame.Searches.NewSearch( query, ticket)
                 
@@ -678 +680 @@
                 gtk.gdk.threads_enter()
                 try:
-                        self.frame.ChatRooms.roomsmaster.SayChatRoom(room, user, text)
+                        self.frame.ChatRooms.SayChatRoom(room, user, text)
                         self.frame.Logging.ChatRoomLog(room, user, text)
                 except Exception,e:
@@ -688 +690 @@
                 if DEBUG == True: print "Logged in, getting Rooms"
                 try:
-                        for rooms1, numbers in roomlist.items():
-                                self.frame.room_lists[str(rooms1)] = numbers
-                        self.frame.ChatRooms.roomsmaster.UpdateRoomList(roomlist)
+                
+                        self.frame.ChatRooms.UpdateRoomList(roomlist)
                         joined_rooms = joined.keys()
                         joined_rooms.sort(key=str.lower)
                         for room in joined_rooms:
-                                room = str(room)
-
-                                roomlist = []
-
-                                for users in joined[room]:
-                                        roomlist.append(users)
-                                        self.frame.user_stats[users] = [joined[room][users][0], joined[room][users][1], joined[room][users][2 ], joined[room][users][3], joined[room][users][4], 1]
-                                self.frame.ChatRooms.roomsmaster.JoinRoom(room, joined[room])
-                        created = []
+                                for users, stats in joined[room].items():
+                                        self.frame.user_stats[users] = [stats[0], stats[1], stats[2], stats[3], stats[4], 1]
+                                self.frame.ChatRooms.JoinRoom(str(room), joined[room])
 
                 except Exception, e:
@@ -717 +712 @@
                         
         
-                        self.frame.ChatRooms.roomsmaster.JoinRoom(room, list_of_users)
+                        self.frame.ChatRooms.JoinRoom(room, list_of_users)
                                 
                                 
@@ -728 +723 @@
                 if DEBUG == True: print " **** cb_room_left %s"% room
                 try:
-                        self.frame.ChatRooms.roomsmaster.LeaveRoom(room)
+                        self.frame.ChatRooms.LeaveRoom(room)
                 except Exception, e:
                         if DEBUG == True: print "Leave room bug", e
@@ -742 +737 @@
                         self.frame.user_stats[user] = [stats[0], stats[1], stats[2 ], stats[3], stats[4], 1] 
                         
-                        self.frame.ChatRooms.roomsmaster.UserJoinedRoom(room, user)
+                        self.frame.ChatRooms.UserJoinedRoom(room, user)
                         
                 except Exception, e:
@@ -755 +750 @@
                                 print "%s left room %s" % (user, room)
                                 
-                        self.frame.ChatRooms.roomsmaster.UserLeftRoom(room, user)
+                        self.frame.ChatRooms.UserLeftRoom(room, user)
 
 
@@ -806 +801 @@
                                 self.frame.TrayApp.SetToolTip( "Couldn't connect to Museek: %s" % "Invalid Password")
                                 self.frame.update_statusbar( "Invalid Password")
-                                
-                                #self.connect()
+        
                                 
                         else:
@@ -864 +858 @@
                         self.config = {}
 
-                        self.frame.ChatRooms.roomsmaster.ConnClose()
+                        self.frame.ChatRooms.ConnClose()
 
                         self.connected = False
@@ -897 +891 @@
                                         self.frame.TrayApp.SetImage("red")
 
-                        
                         self.frame.username = username
-                        #self.start_MurmurWindow("window")
-        
-                        
+                                        
                 except Exception,e:
                         if DEBUG == True: print " **** cb_server_state ERROR", e
@@ -956 +947 @@
                         if DEBUG == True: print " **** cb_peer_stats ERROR", e
                 #gtk.gdk.threads_enter()
+                
+                self.frame.ChatRooms.GetUserStats( user, speed, files)
                 self.frame.userlists.updateStats(user, self.frame.user_stats[user])
 
@@ -972 +965 @@
                         
                         ## Update Lists with new status information
-                        self.frame.ChatRooms.roomsmaster.GetUserStatus( user, status)
+                        self.frame.ChatRooms.GetUserStatus( user, status)
                         self.frame.userlists.updateStatus(user, status)
                         self.frame.PrivateChats.updateStatus(user, status)
@@ -1221 +1214 @@
         # @param searchtype (0:Global, 1:Buddy, 2:Rooms)
         # @param query Search string
-        def Search(self, searchtype, query):
-                message = messages.Search(searchtype, query )
-                self.SendMessage(message)
+        def Search(self, searchtype, query, user=None):
+
+                if searchtype in (0, 1, 2):
+                        message = messages.Search(searchtype, query )
+                        self.SendMessage(message)
+                elif searchtype == 3 and user is not None:
+                        self.UserSearch(user, query)
+                        
         ## Search a user's shares for a string
         # @param self Networking (class)
@@ -1460 +1458 @@
         def OnJoinRoom(self, widget):
                 room = self.user
-                self.frame.RoomJoin(room)
+                self.frame.JoinARoom(room)
 
         
@@ -1504 +1502 @@
                 hbox1.set_spacing(5)
                 
-                label1 = gtk.Label(("Search Shares For:"))
-                label1.set_padding(5, 0)
-                label1.show()
-                hbox1.pack_start(label1, False, False, 5)
+                self.label1 = gtk.Label(("Search Shares For:"))
+                self.label1.set_padding(5, 0)
+                self.label1.show()
+                hbox1.pack_start(self.label1, False, False, 5)
                 
                 self.entry = entry= gtk.Entry()
@@ -1517 +1515 @@
                 hbox1.pack_start(entry, True, True, 5)
                 
-                self.searchbutton = self.frame.CreateIconButton(gtk.STOCK_FIND, "stock", self.SearchShares, "Search")
-
-                
-                hbox1.pack_start(self.searchbutton, False, False, 5)
+                self.SearchButton = self.frame.CreateIconButton(gtk.STOCK_FIND, "stock", self.SearchShares, "Search")
+
+                
+                hbox1.pack_start(self.SearchButton, False, False, 5)
+                
+                self.RefreshButton = self.frame.CreateIconButton(gtk.STOCK_REFRESH, "stock", self.OnRefreshShares, "Refresh")
+
+                
+                hbox1.pack_start(self.RefreshButton, False, False, 5)
                 
                 self.Main.pack_start(hbox1, False, True, 0)
@@ -1686 +1689 @@
                 files = []
                 files += self.DownloadDirectoryRecursive(dir, os.path.join(localdir, ""))
-                print files
+                
                 # Check the number of files to be downloaded, just to make sure we aren't accidently downloading hundreds or thousands
                 numfiles = len(files)
@@ -1744 +1747 @@
         def OnDownloadFiles(self, widget, prefix = ""):
                 dir = self.selected_folder
-                print self.selected_files
                 for fn in self.selected_files:
                         self.frame.Networking.DownloadFileTo(self.user, "\\".join([dir, fn]), prefix)
@@ -1859 +1861 @@
                 if DEBUG == True:  print "-- dir :", directory
                 self.BrowseChangeDir(self.user, directory)
-                        
+                
+        def SetSensitive(self, bool):
+                self.DirTreeView.set_sensitive(bool)
+                self.FilesTreeView.set_sensitive(bool)
+                self.SearchButton.set_sensitive(bool)
+                self.RefreshButton.set_sensitive(bool)
+                self.entry.set_sensitive(bool)
+                self.label1.set_sensitive(bool)
+                
         def ShowShares(self, user, shares):
                 try:
+                        
                         if user != self.user:
                                 return
@@ -1869 +1880 @@
                         self.BrowseChangeDir(user, directory)
                         self.DirTreeView.expand_all()
+                        self.SetSensitive(True)
                         
                 except Exception,e:
@@ -1875 +1887 @@
         def OnClose(self, user):
                 self.browses.RemoveTab(self)
-
-        def SearchShares(self, user):
+                
+        def OnRefreshShares(self, widget):
+                self.SetSensitive(False)
+                self.frame.GetShares(self.user)
+                
+        def SearchShares(self, widget):
                 query = self.entry.get_text()
                 if self.query == query:
@@ -1883 +1899 @@
                         self.search_position = 0
                 self.query = query
+                if self.query == "":
+                        return
                 if DEBUG == True: print "Query:", query
                 dir = self.directory
@@ -2022 +2040 @@
 
                         self.users[user].ShowShares(user, shares)
+                self.request_changed(self.users[user].Main)
                 self.frame.RequestIcon(self.frame.UserBrowseLabel)      
         def OnSwitchPage(self, notebook, page, page_num, force = 0):
@@ -2233 +2252 @@
 
                         self.users[user].ShowInfo(user, info, picture, uploads, queue, slotsfree)
-                        
+                self.request_changed(self.users[user].Main)
         def OnSwitchPage(self, notebook, page, page_num, force = 0):
                 
@@ -2552 +2571 @@
                 elif cmd in ["/s", "/search"]:
                         if realargs:
-                                self.frame.Searches.DoSearch(0, realargs)
+                                self.frame.Networking.Search(0, realargs)
                                 self.frame.OnSearch(None)
                 elif cmd in ["/us", "/usearch"]:
-                        if realargs:
-                                self.frame.searches.user = self.user
-                                self.frame.searches.DoSearch(3, realargs)
+                        s = args.split(" ", 1)
+                        if len(s) == 2:
+                                self.frame.Networking.Search(3, s[1], s[0])
                                 self.frame.OnSearch(None)
+                        else:
+                                return
                 elif cmd in ["/rs", "/rsearch"]:
                         if realargs:
-                                #self.frame.searches.DoSearch(1, realargs)
+                                self.frame.Networking.Search(1, realargs)
                                 self.frame.OnSearch(None)
                 elif cmd in ["/bs", "/bsearch"]:
                         if realargs:
-                                self.frame.searches.DoSearch(2, realargs)
+                                self.frame.Networking.Search(2, realargs)
                                 self.frame.OnSearch(None)
                 elif cmd in ["/ad", "/add", "/buddy"]:
@@ -2715 +2736 @@
                         return
 
-                #ctcpversion = 0
-                #if text == "\x01VERSION\x01":
-                        #ctcpversion = 1
-                        #text = "CTCP VERSION"
+                ctcpversion = 0
+                if text == "\x01VERSION\x01":
+                        ctcpversion = 1
+                        text = "CTCP VERSION"
                 self.SendMessage(user, None)
                 tab = self.users[user]
@@ -2730 +2751 @@
                                 #self.frame.tray_status["hilites"]["private"].append(msg.user)
                                 #self.frame.SetImage(None)
-                                
+                self.request_changed(self.users[user].Main)
+                
         def OnSwitchPage(self, notebook, page, page_num, force = 0):
                 if self.frame.notebook_outside.get_current_page() != 1 and not force:
@@ -2766 +2788 @@
                 del self.tickets[tab.ticket]
                 
-        def DoSearch(self, searchtype, query):
-                self.frame.Networking.Search(searchtype, query)
+        def DoSearch(self, searchtype, query, user=None):
+                self.frame.Networking.Search(searchtype, query, user=None)
                         
         def OnSwitchPage(self, notebook, page, page_num, force = 0):
@@ -2781 +2803 @@
                 if self.tickets.has_key(ticket):
                         self.tickets[ticket].NewResults(user, free, speed, queue, results)
+                        self.request_changed(self.tickets[ticket].Main)
                         
         def NewSearch(self, query, ticket):
@@ -2807 +2830 @@
                 
                 self.ScrolledWindow =  gtk.ScrolledWindow()
-                self.ScrolledWindow.set_policy(gtk.POLICY_ALWAYS, gtk.POLICY_ALWAYS)
+                self.ScrolledWindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
                 self.ScrolledWindow.show()
                 self.ScrolledWindow.set_shadow_type(gtk.SHADOW_IN)
@@ -3119 +3142 @@
 class ChatRoom:
         
-        def __init__(self, roomsmaster, room, users):
+        def __init__(self, chatrooms, room, users):
                 self.lines = []
-                self.roomsmaster = roomsmaster
-                self.frame = roomsmaster.frame
+                self.chatrooms = chatrooms
+                self.frame = chatrooms.frame
                 self.room = room
                 self.leaving = 0
@@ -3195 +3218 @@
                         hspeed = Humanize(users[user][1])
                         hfiles = Humanize(users[user][3])
-                        #iter = self.usersmodel.append([img, user, hspeed, hfiles, users[user][0], users[user][1], users[user][2]])
-                        iter = self.usersmodel.append([img, str(user), hfiles, hspeed, users[user][0] ] ) #, , users[user][1], users[user][2]])
+                        iter = self.usersmodel.append([img, str(user), hfiles, hspeed, users[user][0] ] )
                         self.users[user] = iter
-                #self.usersmodel.set_sort_column_id(1, gtk.SORT_ASCENDING)
+                self.usersmodel.set_sort_column_id(1, gtk.SORT_ASCENDING)
                 
                 self.popup_menu = popup = PopupMenu(self.frame, "chat")
@@ -3330 +3352 @@
                                 
                 elif cmd == "/reload":
-                        self.Networking.ReloadShares()
+                        self.frame.Networking.ReloadShares()
                         
                 elif cmd == "/pm":
@@ -3346 +3368 @@
                 elif cmd in ["/s", "/search"]:
                         if realargs:
-                                self.frame.Searches.DoSearch(0, realargs)
+                                self.frame.Networking.Search(0, realargs)
                                 self.frame.OnSearch(None)
                 elif cmd in ["/us", "/usearch"]:
-                        if realargs:
-                                self.frame.searches.user = self.user
-                                self.frame.searches.DoSearch(3, realargs)
+                        s = args.split(" ", 1)
+                        if len(s) == 2:
+                                self.frame.Networking.Search(3, s[1], s[0])
                                 self.frame.OnSearch(None)
+                        else:
+                                return
+                        #if realargs:
+                                ##self.frame.Searches.user = self.user
+                                #self.frame.Searches.DoSearch(3, realargs)
+                                #self.frame.OnSearch(None)
                 elif cmd in ["/rs", "/rsearch"]:
                         if realargs:
+                                self.frame.Networking.Search(2, realargs)
                                 self.frame.OnSearch(None)
                 elif cmd in ["/bs", "/bsearch"]:
                         if realargs:
-                                self.frame.searches.DoSearch(2, realargs)
+                                self.frame.Networking.Search(1, realargs)
                                 self.frame.OnSearch(None)
                 elif cmd in ["/ad", "/add", "/buddy"]:
@@ -3477 +3506 @@
 
                         self.lines.append(AppendLine(self.chatview, message, None, username=user, usertag=self.tag_users[user]))
-                        
+                if user != self.frame.username and self.frame.username in message:
+                                self.chatrooms.request_hilite(self.Main)
+                else:
+                        self.chatrooms.request_changed(self.Main)
                 #if self.Log.get_active():
                         #self.logfile = WriteLog(self.logfile, self.frame.np.config.sections["logging"]["logsdir"], self.room, line)
@@ -3543 +3575 @@
                 self.usersmodel.set(self.users[user], 0, img, 4, status)
                 
+        def GetUserStats(self, user, speed, files):
+                if not self.users.has_key(user):
+                        return
+                hspeed = Humanize(speed)
+                hfiles = Humanize(files)
+                self.usersmodel.set(self.users[user], 2, hfiles, 3, hspeed)
+
         def GetUserStatus(self, user, status):
                 if not self.users.has_key(user):
@@ -3668 +3707 @@
                 if self.leaving:
                         return
-                if self.room in self.roomsmaster.joinedrooms:
+                if self.room in self.chatrooms.joinedrooms:
                         self.frame.Networking.LeaveRoom(self.room)
                 self.Leave.set_sensitive(False)
@@ -3690 +3729 @@
                 self.popup_enable()
                 self.frame = frame
-                self.roomsmaster = MasterRoom(frame)
+                
+                self.joinedrooms = {}
+                self.rooms = {}
+                self.autojoin = 1
+                
+                self.CreateRoomList()
                 
                 self.set_tab_pos(gtk.POS_TOP)
@@ -3696 +3740 @@
                 self.show()
                 self.connect("switch-page", self.OnSwitchPage)
-                
-        def ConnClose(self):
-                self.roomsmaster.ConnClose()
+      &