Merge lp:~nicolas-espina/dockmanager/dockmanager-helpers into lp:dockmanager

[Nicolas]

I update the Pidgin and Emesene helpers, now the two applications uses the message count, menu entries in the dock menu to change status and the icon in the dock changes to show the actual status of the app.

This is my first approach in bzr+launchpad, so if you need something else just ask me, i have a diff file but i think that launchad makes a diff for you when i finish to send this

[Rico Tzschichholz (ricotz)]

Creating and adding the menu entries only once is more stable, but you removed with this change the selective showing of them depending on the current connection state.

So at least the Connected/Disconnected status should take effect on what menu items are shown?

review: Needs Information

[Nicolas (nicolas-espina)]

I remove the change of states depending of the state of the IM to follow
the behavior of emesene and pidgin... They show ALL the status and no
depends of the actual. And i remove that behavior too because sometimes (and
for a strange reason that i never know) some statuses appears more than
once, so my decision to make them free of bugs was to remove that and show
all the status... BTW, the skype helper add all the entries and is really
nice

[Nicolas (nicolas-espina)]

I remove the change of states depending of the state of the IM to follow the behavior of emesene and pidgin... They show ALL the status and no depends of the actual. And i remove that behavior too because sometimes (and for a strange reason that i never know) some statuses appears more than once, so my decision to make them free of bugs was to remove that and show all the status... BTW, the skype helper add all the entries and is really nice

[Rico Tzschichholz (ricotz)]

You might want to add some strings constants like the skype helper has and replace the duplicated usage of these icon paths. This also makes it easier to fix these hardcoded paths in future somehow.

review: Needs Fixing

[Nicolas (nicolas-espina)]

Ok... I have a really important exam so in the next week i finish well the code looking for the skype helper... Thanks for the help and in a close future you have notice of my helpers :D ... Cheers

[Rico Tzschichholz (ricotz)]

@Nicolas: I hope you are going to finish your work. :)

review: Needs Information

[Nicolas (nicolas-espina)]

Ups... I forgot this completlly.. Really sorry for that... I finish all my
exams in exactly one week and i finish this =)

Sorry again

2010/12/6 Rico Tzschichholz <email address hidden>

> Review: Needs Information
> @Nicolas: I hope you are going to finish your work. :)
> --
>
> https://code.launchpad.net/~nicolas-espina/dockmanager/dockmanager-helpers/+merge/33950
> You are the owner of lp:~nicolas-espina/dockmanager/dockmanager-helpers.
>

[lp:~nicolas-espina/dockmanager/dockmanager-helpers]

68. By Nicolas on 2010-12-19

Now the icons are retrieved first in constants

[Nicolas (nicolas-espina)]

Rico: I fix the problem that my scripts have with the icon retrieves... Now i use the constants like you say... I hope that now everything is fine and ready to merge :D

Unmerged revisions

68. By Nicolas on 2010-12-19

Now the icons are retrieved first in constants

67. By Nicolas on 2010-08-27

Now pidgin show the status on Docky

66. By Nicolas on 2010-08-27

Fixed menu entries in the pidgin helper

65. By Nicolas on 2010-08-27

Updated emesene helper with some cool stuff

64. By Nicolas on 2010-08-27

First merge of the main branch

=== modified file 'scripts/emesene_control.py'
--- scripts/emesene_control.py	2010-08-06 23:14:20 +0000
+++ scripts/emesene_control.py	2010-12-19 23:01:35 +0000
@@ -37,11 +37,24 @@
 emesenepath = "/org/emesene/dbus"
 emeseneiface = "org.emesene.dbus"
 
+STATUS_ICON_ONLINE = '/usr/share/emesene/themes/default/online.png'
+STATUS_ICON_INVISIBLE = '/usr/share/emesene/themes/default/invisible.png'
+STATUS_ICON_AWAY = '/usr/share/emesene/themes/default/away.png'
+STATUS_ICON_IDLE = '/usr/share/emesene/themes/default/idle.png'
+STATUS_ICON_BUSY = '/usr/share/emesene/themes/default/busy.png'
+
 class EmeseneItem(DockManagerItem):
 	def __init__(self, sink, path):
 		DockManagerItem.__init__(self, sink, path)
 		self.emesene = None
 
+		#Menu Items
+
+ 		self.add_menu_item("Online", STATUS_ICON_ONLINE, "Status")
+ 		self.add_menu_item("Away", STATUS_ICON_AWAY, "Status")
+ 		self.add_menu_item("Busy", STATUS_ICON_BUSY, "Status")
+ 		self.add_menu_item("Invisible", STATUS_ICON_INVISIBLE, "Status")
+
 		self.bus.add_signal_receiver(self.name_owner_changed_cb, dbus_interface='org.freedesktop.DBus', signal_name = 'NameOwnerChanged')
 		obj = self.bus.get_object("org.freedesktop.DBus", "/org/freedesktop/DBus")
 		self.bus_interface = dbus.Interface(obj, "org.freedesktop.DBus")
@@ -49,6 +62,8 @@
 		self.bus_interface.ListNames (reply_handler=self.list_names_handler, error_handler=self.list_names_error_handler)
 
 		self.bus.add_signal_receiver(self.conversation_updated, "unread_messages", emeseneiface, emesenebus, emesenepath)
+		self.bus.add_signal_receiver(self.status_changed, "status_changed", emeseneiface, emesenebus, emesenepath)
+
 	
 	def list_names_handler(self, names):
 		if emesenebus in names:
@@ -69,10 +84,29 @@
 	def init_emesene_objects(self):
 		obj = self.bus.get_object(emesenebus, emesenepath)
 		self.emesene = dbus.Interface(obj, emeseneiface)
+		self.update_icon(self.emesene.get_status())
 
 	def conversation_updated(self, count):
 		self.update_badge()
 
+	def status_changed(self, a, b):
+		self.update_icon(b)
+		self.update_badge()
+
+	def update_icon(self,status):
+		if status == 'NLN':
+			status_image = STATUS_ICON_ONLINE
+		elif status == 'AWY':
+			status_image = STATUS_ICON_AWAY
+		elif status == 'BSY':
+			status_image = STATUS_ICON_BUSY
+		elif status == 'HDN':
+			status_image = STATUS_ICON_INVISIBLE
+		elif status == 'IDL':
+			status_image = STATUS_ICON_IDLE
+		self.set_icon(status_image)		
+		return True		
+
 	def update_badge(self):
 		if not self.emesene:
 			self.reset_badge()
@@ -86,13 +120,22 @@
 
 		return True		
 
+  	def menu_pressed(self, menu_id):
+ 		if self.id_map[menu_id] == "Online":
+ 			self.emesene.set_status('NLN')
+ 		elif self.id_map[menu_id] == "Away":
+ 			self.emesene.set_status('AWY')
+ 		elif self.id_map[menu_id] == "Busy":
+ 			self.emesene.set_status('BSY')
+ 		elif self.id_map[menu_id] == "Invisible":
+ 			self.emesene.set_status('HDN')
+
 class EmeseneSink(DockManagerSink):
 	def item_path_found(self, pathtoitem, item):
 		if item.Get(DOCKITEM_IFACE, "DesktopFile", dbus_interface="org.freedesktop.DBus.Properties").endswith ("emesene.desktop"):
 			self.items[pathtoitem] = EmeseneItem(self, pathtoitem)
 
 emesenesink = EmeseneSink()
-
 def cleanup():
 	emesenesink.dispose()
 

=== modified file 'scripts/pidgin_control.py'
--- scripts/pidgin_control.py	2010-08-06 23:14:20 +0000
+++ scripts/pidgin_control.py	2010-12-19 23:01:35 +0000
@@ -38,6 +38,12 @@
 pidginpath = "/im/pidgin/purple/PurpleObject"
 pidginitem = "im.pidgin.purple.PurpleInterface"
 
+STATUS_ICON_AVAILABLE = '/usr/share/pixmaps/pidgin/status/48/available.png'
+STATUS_ICON_AWAY = '/usr/share/pixmaps/pidgin/status/48/away.png'
+STATUS_ICON_BUSY = '/usr/share/pixmaps/pidgin/status/48/busy.png'
+STATUS_ICON_INVISIBLE = '/usr/share/pixmaps/pidgin/status/48/invisible.png'
+STATUS_ICON_DISCONNECT = '/usr/share/pixmaps/pidgin/status/48/offline.png'
+
 
 class PidginDBus():
 	def __init__(self):
@@ -52,6 +58,10 @@
 	def IsAway(self):
 		status = self.iface.PurpleSavedstatusGetCurrent()	
 		return not self.iface.PurpleSavedstatusGetType(status) == 5
+
+	def getStatus(self):
+		status = self.iface.PurpleSavedstatusGetCurrent()	
+		return self.iface.PurpleSavedstatusGetType(status)
 		
 	def Available(self):
 		new_status = self.iface.PurpleSavedstatusNew("", 2)
@@ -65,11 +75,27 @@
 		new_status = self.iface.PurpleSavedstatusNew("", 5)
 		self.iface.PurpleSavedstatusActivate(new_status)
 
+	def Busy(self):
+		new_status = self.iface.PurpleSavedstatusNew("", 3)
+		self.iface.PurpleSavedstatusActivate(new_status)
+
+	def Invisible(self):
+		new_status = self.iface.PurpleSavedstatusNew("", 4)
+		self.iface.PurpleSavedstatusActivate(new_status)
+
 
 class PidginItem(DockManagerItem):
 	def __init__(self, sink, path):
 		DockManagerItem.__init__(self, sink, path)
 		self.pidgin = None
+
+		#Menu Items
+
+		self.add_menu_item ("Available", STATUS_ICON_AVAILABLE,"Status")
+		self.add_menu_item ("Away", STATUS_ICON_AWAY,"Status")
+		self.add_menu_item ("Busy", STATUS_ICON_BUSY,"Status")
+		self.add_menu_item ("Invisible", STATUS_ICON_INVISIBLE,"Status")
+		self.add_menu_item ("Disconnect", STATUS_ICON_DISCONNECT,"Status")
 		
 		self.bus.add_signal_receiver(self.name_owner_changed_cb,
 				dbus_interface='org.freedesktop.DBus',
@@ -86,7 +112,7 @@
 	def list_names_handler(self, names):
 		if pidginbus in names:
 			self.init_pidgin_objects()
-			self.set_menu_buttons()
+#			self.set_menu_buttons()
 			self.update_badge()
 
 	def list_names_error_handler(self, error):
@@ -98,37 +124,55 @@
 				self.init_pidgin_objects()
 			else:
 				self.pidgin = None
-			self.set_menu_buttons()
+#			self.set_menu_buttons()
 			self.update_badge()
 	
 	def init_pidgin_objects(self):
 		self.pidgin = PidginDBus()
+		self.update_icon()
 
-	def status_changed(self, a, b, c):
-		self.set_menu_buttons()
+	def status_changed(self, account, old, new):
+#		self.set_menu_buttons()
+		self.update_icon()
 		self.update_badge()
+
+	def update_icon(self):
+		status = self.pidgin.getStatus()
+		if status == 2:
+			status_image = STATUS_ICON_AVAILABLE
+		elif status == 5:
+			status_image = STATUS_ICON_AWAY
+		elif status == 3:
+			status_image = STATUS_ICON_BUSY
+		elif status == 4:
+			status_image = STATUS_ICON_INVISIBLE
+		elif status == 1:
+			status_image = STATUS_ICON_DISCONNECT
+		self.set_icon(status_image)
+		return True		
+
 	
 	def conversation_updated(self, conv, type):
 		self.update_badge()
 
-	def clear_menu_buttons(self):
-		for k in self.id_map.keys():
-			self.remove_menu_item(k)
-	
-	def set_menu_buttons(self):
-		self.clear_menu_buttons()
-				
-		if not self.pidgin or not self.iface:
-			return
+#	def clear_menu_buttons(self):
+#		for k in self.id_map.keys():
+#			self.remove_menu_item(k)
 
-		if self.pidgin.IsConnected():
-			if self.pidgin.IsAway():
-				self.add_menu_item ("Set Away", "/usr/share/pixmaps/pidgin/status/16/away.png")
-			else:
-				self.add_menu_item ("Set Available", "/usr/share/pixmaps/pidgin/status/16/available.png")
-			self.add_menu_item ("Disconnect", "/usr/share/pixmaps/pidgin/status/16/offline.png")
-		else:
-			self.add_menu_item ("Connect", "/usr/share/pixmaps/pidgin/status/16/available.png")
+#	def set_menu_buttons(self):
+#		self.clear_menu_buttons()
+#				
+#		if not self.pidgin or not self.iface:
+#			return
+#
+#		if self.pidgin.IsConnected():
+#			if self.pidgin.IsAway():
+#				self.add_menu_item ("Set Away", "/usr/share/pixmaps/pidgin/status/16/away.png")
+#			else:
+#				self.add_menu_item ("Set Available", "/usr/share/pixmaps/pidgin/status/16/available.png")
+#			self.add_menu_item ("Disconnect", "/usr/share/pixmaps/pidgin/status/16/offline.png")
+#		else:
+#			self.add_menu_item ("Connect", "/usr/share/pixmaps/pidgin/status/16/available.png")
 		
 	def update_badge(self):
 		if not self.pidgin:
@@ -150,8 +194,12 @@
 		
 		if menu_id == "Disconnect":
 			self.pidgin.Disconnect()
-		elif menu_id == "Set Away":
+		elif menu_id == "Away":
 			self.pidgin.Away()
+		elif menu_id == "Invisible":
+			self.pidgin.Invisible()
+		elif menu_id == "Busy":
+			self.pidgin.Busy()
 		else:
 			self.pidgin.Available()