Changeset 7888 for branches/gajim_0.11/src/disco.py

Timestamp:

01/23/07 21:32:43 (23 months ago)

Author:

asterix

Message:

merge fixes from trunk

Files:

• branches/gajim_0.11/src/disco.py (modified) (7 diffs)

branches/gajim_0.11/src/disco.py

@@ -48 +48 @@
 import gtkgui_helpers
 import groups
+import adhoc_commands
 
 from common import gajim
@@ -987 +988 @@
                 self.register_button = None
                 self.join_button = None
+                self.execute_button = None
                 # Keep track of our treeview signals
                 self._view_signals = []
@@ -1141 +1143 @@
         def _add_actions(self):
                 AgentBrowser._add_actions(self)
+                self.execute_button = gtk.Button()
+                image = gtk.image_new_from_stock(gtk.STOCK_EXECUTE, gtk.ICON_SIZE_BUTTON)
+                label = gtk.Label(_('_Execute Command...'))
+                label.set_use_underline(True)
+                hbox = gtk.HBox()
+                hbox.pack_start(image, False, True, 6)
+                hbox.pack_end(label, True, True)
+                self.execute_button.add(hbox)
+                self.execute_button.connect('clicked', self.on_execute_button_clicked)
+                self.window.action_buttonbox.add(self.execute_button)
+                self.execute_button.show_all()
+
                 self.register_button = gtk.Button(label=_("Re_gister"),
                         use_underline=True)
@@ -1160 +1174 @@
 
         def _clean_actions(self):
+                if self.execute_button:
+                        self.execute_button.destroy()
+                        self.execute_button = None
                 if self.register_button:
                         self.register_button.destroy()
@@ -1179 +1196 @@
                 self.window.services_treeview.queue_draw()
 
+        def on_execute_button_clicked(self, widget = None):
+                '''When we want to execute a command:
+                open adhoc command window'''
+                model, iter = self.window.services_treeview.get_selection().get_selected()
+                if not iter:
+                        return
+                service = model[iter][0].decode('utf-8')
+                adhoc_commands.CommandWindow(self.account, service)
+
         def on_register_button_clicked(self, widget = None):
                 '''When we want to register an agent:
@@ -1208 +1234 @@
 
         def update_actions(self):
+                if self.execute_button:
+                        self.execute_button.set_sensitive(False)
                 if self.register_button:
                         self.register_button.set_sensitive(False)
@@ -1244 +1272 @@
         def _update_actions(self, jid, node, identities, features, data):
                 AgentBrowser._update_actions(self, jid, node, identities, features, data)
+                if self.execute_button and xmpp.NS_COMMANDS in features:
+                        self.execute_button.set_sensitive(True)
                 if self.register_button and xmpp.NS_REGISTER in features:
                         # We can register this agent