Changeset 402

Timestamp:

01/09/07 20:44:45 (20 months ago)

Author:

daelstorm

Message:

Murmur: Username colors and popup menus in chat rooms, and just username colors in private chat

Location:

murmur/trunk/sources

Files:

• murmur (modified) (16 diffs)
• pymurmur/utils.py (modified) (3 diffs)

murmur/trunk/sources/murmur

@@ -971 +971 @@
                         self.frame.ChatRooms.roomsmaster.GetUserStatus( user, status)
                         self.frame.userlists.updateStatus(user, status)
+                        self.frame.PrivateChats.updateStatus(user, status)
                         
                 except Exception,e:
@@ -2097 +2098 @@
                 self.frame = chats.frame
                 self.user = user
-        
+                self.Status = 0
                 self.Main = gtk.VBox(False, 0)
                 self.Main.show()
@@ -2185 +2186 @@
         def UpdateColours(self):
                 def makecolour(buffer, colour):
-                        colour = self.frame.Config["colors"][colour]
+                        if self.frame.Config["colors"].has_key(colour):
+                                colour = self.frame.Config["colors"][colour]
+                        else:
+                                colour = "#AAFF00"
                         font = self.frame.Config["colors"]["chatfont"]
+                        
                         if colour:
                                 return buffer.create_tag(foreground = colour, font=font)
@@ -2198 +2203 @@
                 self.tag_me = makecolour(buffer, "chatme")
                 self.tag_hilite = makecolour(buffer, "chathilite")
-
+                
+                if self.frame.user_stats.has_key(self.user):
+                        status = self.frame.user_stats[self.user][0]
+                        if status == 1:
+                                color = "useraway"
+                        elif status == 2:
+                                color = "useronline"
+                        else:
+                                color = "useroffline"
+                else:
+                        color = "useroffline"
+                self.tag_username = makecolour(buffer, color)
+
+                
+        def changecolour(self, tag, colour):
+                if self.frame.Config["colors"].has_key(colour):
+                        colour = self.frame.Config["colors"][colour]
+                else:
+                        colour = ""
+                font = self.frame.Config["colors"]["chatfont"]
+                
+                if colour:
+                        tag.set_property("foreground", colour)
+                        tag.set_property("font", font)
+                else:
+                        tag.set_property("font", font)
+                        
+        def ChangeColours(self):
+                
+                                
+                self.changecolour(self.tag_remote, "chatremote")
+                self.changecolour(self.tag_local, "chatlocal")
+                self.changecolour(self.tag_me, "chatme")
+                self.changecolour(self.tag_hilite, "chathilite")
+                self.changecolour(self.tag_username, color)
+                self.setStatus()
+                
+        def setStatus(self):
+                
+                if self.frame.user_stats.has_key(self.user):
+
+                        if self.Status == self.frame.user_stats[self.user][0]:
+                                return
+                        self.Status = self.frame.user_stats[self.user][0]
+                        if self.Status == 1:
+                                color = "useraway"
+                        elif self.Status == 2:
+                                color = "useronline"
+                        else:
+                                color = "useroffline"
+                else:
+                        color = "useroffline"
+                        self.Status = 0
+
+                self.changecolour(self.tag_username, color)
+                
         def OnClose(self, widget):
                 #if self.logfile is not None:
@@ -2226 +2286 @@
                         line = "[%s] %s" % (username, text)
                 self.frame.RequestIcon(self.frame.PrivateChatLabel)
-                AppendLine(self.ChatScroll, line, tag, "%c")
+                AppendLine(self.ChatScroll, line, tag, "%c", username=self.user, usertag=self.tag_username)
+                #if self.z:
+                        #self.z = 0
+                        #self.tag_username.set_property("foreground", "#00FF00")
+                #else:
+                        #self.z = 1
+                        #self.tag_username.set_property("foreground", "#FF0000")
                 #if self.Log.get_active():
                         #self.logfile = WriteLog(self.logfile, self.frame.np.config.sections["logging"]["logsdir"], self.user, line)
@@ -2248 +2314 @@
                         tag = self.tag_local
                         
-                AppendLine(self.ChatScroll, line, tag, "%c")
+                AppendLine(self.ChatScroll, line, tag, "%c", username=self.user, usertag= self.tag_username)
                 #if self.Log.get_active():
                         #self.logfile = WriteLog(self.logfile, self.frame.np.config.sections["logging"]["logsdir"], self.user, line)
@@ -2484 +2550 @@
                                 gobject.idle_add(tab.ChatLine.grab_focus)
                                 break
-
-                
+                        
+        def updateStatus(self, user, status):
+                if self.users.has_key(user):
+                        gobject.idle_add(self.users[user].setStatus)
+                        
         def RemoveTab(self, tab):
                 self.remove_page(self.page_num(tab.Main) )
@@ -3033 +3102 @@
                 self.chatEntry.grab_focus()
                 self.vbox.set_focus_child(self.chatEntry)
+                
+                self.UpdateColours()
 
         def autojoin_check(self, widget, string):
@@ -3097 +3168 @@
                 "/rescan", "/tick", "/nsa", "/info"]
                 #"/rem ", "/cl", "/t", "/a", "/q", "/l", "/p", "/bs", "/rs", "/us", "/s", "/m", "/w", "/al", "/un", "/w"
+                
         def SayInChatRoom(self, user, line):
                 if len(self.lines) >= 400:
@@ -3121 +3193 @@
                 
                         message = "\n-- ".join(message.split("\n"))
-        
-                        self.lines.append(AppendLine(self.chatview, message, None))
+
+                        self.lines.append(AppendLine(self.chatview, message, None, username=user, usertag=self.tag_users[user]))
+                        
                 #if self.Log.get_active():
                         #self.logfile = WriteLog(self.logfile, self.frame.np.config.sections["logging"]["logsdir"], self.room, line)
@@ -3167 +3240 @@
                 iter = self.usersmodel.append([img, username, hfiles, hspeed, status])
                 self.users[username] = iter
+                color = self.getUserStatusColor(status)
+                if username in self.tag_users.keys():
+                        self.changecolour(self.tag_users[username], color)
+                else:
+                        self.tag_users[username] = self.makecolour(self.chatview.get_buffer(), color, username=username)
         
         def UserLeftRoom(self, username):
@@ -3174 +3252 @@
                 self.usersmodel.remove(self.users[username])
                 del self.users[username]
+                if username in self.tag_users.keys():
+                        color = self.getUserStatusColor(-1)
+                        self.changecolour(self.tag_users[username], color)
                 
         def GetListStatus(self, user):
@@ -3191 +3272 @@
                                 action = _("%s has returned")
                         AppendLine(self.RoomLog, action % user, None)
-        
+                        if user in self.tag_users.keys():
+                                color = self.getUserStatusColor(status)
+                                self.changecolour(self.tag_users[user], color)
                         self.usersmodel.set(self.users[user], 0, img, 4, status)
 
+        def makecolour(self, buffer, colour, username=None):
+                colour = self.frame.Config["colors"][colour]
+                font =  self.frame.Config["colors"]["chatfont"]
+                if colour:
+                        tag = buffer.create_tag(foreground = colour, font=font)
+                else:
+                        tag = buffer.create_tag( font=font)
+                if username is not None:
+
+                        #tag.set_property("underline", pango.UNDERLINE_SINGLE)
+                        tag.set_property("weight",  pango.WEIGHT_BOLD)
+                        tag.connect("event", self.UserNameEvent, username)
+                        tag.last_event_type = -1
+                        #tag = buffer.create_tag( font=font)
+                return tag
+                
+        def UserNameEvent(self, tag, widget, event, iter, user):
+                if tag.last_event_type == gtk.gdk.BUTTON_PRESS and event.type == gtk.gdk.BUTTON_RELEASE and event.button == 1:
+                        if user in self.users.keys():
+                                self.popup_menu.set_user(user)
+                                items = self.popup_menu.get_children()
+                                # Chat, Userlists use the normal popup system
+                                num = 5
+                                items[num].set_active(self.frame.Networking.config["buddies"].has_key(user))
+                                items[num+1].set_active(self.frame.Networking.config["banned"].has_key(user))
+                                items[num+2].set_active(self.frame.Networking.config["ignored"].has_key(user))
+                                items[num+3].set_active(self.frame.Networking.config["trusted"].has_key(user))
+                                self.popup_menu.popup(None, None, None, event.button, event.time)
+                tag.last_event_type = event.type
+        def UpdateColours(self):
+                
+                                
+                buffer = self.chatview.get_buffer()
+                self.tag_remote = self.makecolour(buffer, "chatremote")
+                self.tag_local = self.makecolour(buffer, "chatlocal")
+                self.tag_me = self.makecolour(buffer, "chatme")
+                self.tag_hilite = self.makecolour(buffer, "chathilite")
+                self.tag_users = {}
+                for user in self.users:
+                        status = self.usersmodel.get_value(self.users[user], 4)
+                        color = self.getUserStatusColor(status)
+                        self.tag_users[user] = self.makecolour(buffer, color, user)
+
+                buffer = self.RoomLog.get_buffer()
+                self.tag_log = self.makecolour(buffer, "chatremote")
+                
+        def getUserStatusColor(self, status):
+                if status == 1:
+                        color = "useraway"
+                elif status == 2:
+                        color = "useronline"
+                else:
+                        color = "useroffline"
+                return color
+        
+        def changecolour(self, tag, colour):
+                if self.frame.Config["colors"].has_key(colour):
+                        color = self.frame.Config["colors"][colour]
+                else:
+                        color = ""
+                font = self.frame.Config["colors"]["chatfont"]
+                
+                if color:
+                        tag.set_property("foreground", color)
+                        tag.set_property("font", font)
+                        if colour in ["useraway", "useronline", "useroffline"]:
+                                tag.set_property("weight",  pango.WEIGHT_BOLD)
+                else:
+                        tag.set_property("font", font)
+                        
+        def ChangeColours(self):
+                
+                                
+                self.changecolour(self.tag_remote, "chatremote")
+                self.changecolour(self.tag_local, "chatlocal")
+                self.changecolour(self.tag_me, "chatme")
+                self.changecolour(self.tag_hilite, "chathilite")
+                self.changecolour(self.tag_username, color)
+                self.setStatus()
+                
         def OnPopupMenuRoom(self, widget, event, string, string2):
                 if event.button != 3:
                         return
                 items = self.popup_menu.get_children()
-                if DEBUG == True: print string
+                #if DEBUG == True: print string
                 # Chat, Userlists use the normal popup system
                 num = 5
@@ -3344 +3507 @@
 
                 self.frame.notebook_roomlist.add(self.Main)
-
+                
                 
         def EnterRoom(self, widget, event):
@@ -3778 +3941 @@
                 for w in [ self.buddies, self.trusted, self.banned, self.ignored ]:
                         gobject.idle_add(w.updateStatus, user, status)
+                        
         def updateListIcon(self, user):
                 for w in [ self.buddies, self.trusted, self.banned, self.ignored ]:
@@ -4741 +4905 @@
                         "now-playing-prefix": None, "browse_display_mode": "filesystem", \
                         "url reader": "firefox", "url custom prefix": ""}, \
-                        "colors": { "chatme":"FOREST GREEN", "chatremote":"","chatlocal":"BLUE", \
+                        "colors": { "chatme":"FOREST GREEN", "chatremote":"", "useronline":"BLACK", "useraway":"ORANGE","useroffline":"#aa0000", "chatlocal":"BLUE", \
                         "chathilite":"red", "search":"","searchq":"GREY", "chatfont": "" },\
                         "logging": { "logcollapsed": "no", "log_dir": "~/.murmur/logs/", "logrooms": 

murmur/trunk/sources/pymurmur/utils.py

@@ -17 +17 @@
 URL_RE = re.compile("(\\w+\\://[\\w\\.].+?)[\\s\\(\\)]|(www\\.\\w+\\.\\w+.*?)[\\s\\(\\)]|(mailto\\:\\w.+?)[\\s\\(\\)]")
 PROTOCOL_HANDLERS = {}
-CATCH_URLS = 0
+CATCH_URLS = 1
 HUMANIZE_URLS = 0
         
@@ -98 +98 @@
         tag.last_event_type = event.type
 
-def AppendLine(textview, line, tag = None, timestamp = "%H:%M:%S"):
+def AppendLine(textview, line, tag = None, timestamp = "%H:%M:%S", username=None, usertag=None):
         def _makeurltag(buffer, tag, url):
                 props = {}
@@ -139 +139 @@
                 match = URL_RE.search(line)
         
+        
         if line:
-                _append(buffer, line, tag)
+                
+                if username != None and usertag != None:
+                        np = re.compile(username)
+                        match = np.search(line)
+                        if match != None:
+                                start = line[:match.start()]
+                                name = match.group()[:]
+                                line = line[match.end():]
+                                _append(buffer, start, tag)
+                                _append(buffer, name, usertag)
+                                _append(buffer, line, tag)
+                        else:
+                                _append(buffer, line, tag)
+                else:
+                        _append(buffer, line, tag)
         
         if not hasattr(scrolledwindow, "need_scroll"):