Changeset 9603

Timestamp:

05/10/08 13:39:25 (3 months ago)

Author:

js

Message:

* Add button for new chat window GUI.
* Buttons get disabled as needed now [we still need something to update

this while the window is open (it might change, for example, the
contact was added)].

* Remove the new accelerators in destroy_menu().
* Move some OTR stuff.
* Don't hide OTR from the user if not available, but set unsensitive.

Files:

• trunk/data/glade/chat_control_popup_menu.glade (modified) (2 diffs)
• trunk/data/glade/message_window.glade (modified) (9 diffs)
• trunk/src/chat_control.py (modified) (10 diffs)
• trunk/src/groupchat_control.py (modified) (1 diff)

trunk/data/glade/chat_control_popup_menu.glade

@@ -6 +6 @@
-    <child>
-      <widget class="GtkImageMenuItem" id="add_to_roster_menuitem">
-visible
+no_show_all
-        <property name="label" translatable="yes">_Add to Roster</property>
-        <property name="use_underline">True</property>
@@ -74 +74 @@
-    <child>
-      <widget class="GtkMenuItem" id="otr_submenu">
-
+
+
-        <property name="label" translatable="yes">Off-the-Record Encryption</property>
-        <property name="use_underline">True</property>

trunk/data/glade/message_window.glade

@@ -185 +185 @@
-                    </child>
-                    <child>
+                      <widget class="GtkButton" id="add_to_roster_button">
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="no_show_all">True</property>
+                        <property name="tooltip" translatable="yes">Add this contact to roster (Ctrl-D)</property>
+                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkImage" id="image9">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="stock">gtk-add</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
-                      <widget class="GtkButton" id="send_file_button">
-                        <property name="visible">True</property>
@@ -203 +227 @@
-                      <packing>
-                        <property name="expand">False</property>
-2
+3
-                      </packing>
-                    </child>
@@ -225 +249 @@
-                      <packing>
-                        <property name="expand">False</property>
-3
+4
-                      </packing>
-                    </child>
@@ -247 +271 @@
-                      <packing>
-                        <property name="expand">False</property>
-4
+5
-                      </packing>
-                    </child>
@@ -269 +293 @@
-                      <packing>
-                        <property name="expand">False</property>
-5
+6
-                      </packing>
-                    </child>
@@ -279 +303 @@
-                      <packing>
-                        <property name="expand">False</property>
-6
+7
-                      </packing>
-                    </child>
@@ -300 +324 @@
-                      <packing>
-                        <property name="expand">False</property>
-7
+8
-                      </packing>
-                    </child>
@@ -312 +336 @@
-                      </widget>
-                      <packing>
-8
+9
-                      </packing>
-                    </child>
@@ -358 +382 @@
-                      <packing>
-                        <property name="expand">False</property>
-9
+10
-                      </packing>
-                    </child>

trunk/src/chat_control.py

@@ -1034 +1034 @@
-                self.handlers[id] = self.actions_button
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                compact_view = gajim.config.get('compact_view')
@@ -1058 +1062 @@
-                img = self.xml.get_widget('convert_to_gc_button_image')
-                img.set_from_pixbuf(gtkgui_helpers.load_icon('muc_active').get_pixbuf())
+
+                # Add to roster button
+                if _('Not in Roster') in contact.groups:
+                        add_to_roster_button.show()
+
+                # If we don't have resource, we can't do file transfer
+                # in transports, contact holds our info we need to disable it too
+                if self.TYPE_ID == message_control.TYPE_PM and self.gc_contact.jid and \
+                self.gc_contact.resource:
+                        send_file_button.set_sensitive(True)
+                elif contact.resource and contact.jid.find('@') != -1:
+                        send_file_button.set_sensitive(True)
+                else:
+                        send_file_button.set_sensitive(False)
+
+                # check if it's possible to convert to groupchat
+                if gajim.get_transport_name_from_jid(self.contact.jid) or \
+                gajim.connections[self.account].is_zeroconf:
+                        convert_to_gc_button.set_sensitive(False)
-                
-                # keep timeout id and window obj for possible big avatar
@@ -1111 +1134 @@
-                
-                self.status_tooltip = gtk.Tooltips()
+
+                if gajim.otr_module:
+                        self.update_otr(True)
+
-                self.update_ui()
-                # restore previous conversation
@@ -1177 +1204 @@
-
-        def update_ui(self):
-                if gajim.otr_module:
-                        self.update_otr(True)
-                # The name banner is drawn here
-                ChatControlBase.update_ui(self)
@@ -1722 +1747 @@
-                menu = xml.get_widget('chat_control_popup_menu')
-
+                add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
-                history_menuitem = xml.get_widget('history_menuitem')
-                toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem')
@@ -1730 +1756 @@
-                start_otr_menuitem = xml.get_widget('start_otr_menuitem')
-                end_otr_menuitem = xml.get_widget('end_otr_menuitem')
-                add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem')
-                send_file_menuitem = xml.get_widget('send_file_menuitem')
-                information_menuitem = xml.get_widget('information_menuitem')
@@ -1770 +1795 @@
-                        toggle_e2e_menuitem.set_sensitive(not self.gpg_is_active)
-
+                # add_to_roster_menuitem
+                if _('Not in Roster') in contact.groups:
+                        add_to_roster_menuitem.show()
+
-                # If we don't have resource, we can't do file transfer
-                # in transports, contact holds our info we need to disable it too
@@ -1784 +1813 @@
-                gajim.connections[self.account].is_zeroconf:
-                        convert_to_gc_menuitem.set_sensitive(False)
-
-                # add_to_roster_menuitem
-                if _('Not in Roster') in contact.groups:
-                        add_to_roster_menuitem.show()
-                        add_to_roster_menuitem.set_no_show_all(False)
-                else:
-                        add_to_roster_menuitem.hide()
-                        add_to_roster_menuitem.set_no_show_all(True)
-
-                # connect signals
@@ -1817 +1838 @@
-
-                if gajim.otr_module:
-how(
+et_sensitive(True
-                        id = otr_settings_menuitem.connect('activate',
-                                self._on_otr_settings_menuitem_activate)
@@ -1842 +1863 @@
-                                gajim.otr_module.OTRL_MSGSTATE_ENCRYPTED)
-
-
-
+
+
+
-                return menu
-
-
+
+
-                # destroy accelerators
-                ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
+                send_file_menuitem.remove_accelerator(ag, gtk.keysyms.f, gtk.gdk.CONTROL_MASK)
+                convert_to_gc_menuitem.remove_accelerator(ag, gtk.keysyms.g, gtk.gdk.CONTROL_MASK)
+                information_menuitem.remove_accelerator(ag, gtk.keysyms.i, gtk.gdk.CONTROL_MASK)
-                history_menuitem.remove_accelerator(ag, gtk.keysyms.h, gtk.gdk.CONTROL_MASK)
-                information_menuitem.remove_accelerator(ag, gtk.keysyms.i, gtk.gdk.CONTROL_MASK)
-                # destroy menu
-                menu.destroy()

trunk/src/groupchat_control.py

@@ -594 +594 @@
-                        self.change_subject_menuitem.set_sensitive(False)
-                        self.change_nick_menuitem.set_sensitive(False)
+
-                return self.gc_popup_menu
-