Changeset 9650

Timestamp:

05/17/08 15:32:37 (2 months ago)

Author:

js

Message:

Same for groupchat.

Files:

• trunk/data/glade/gc_control_popup_menu.glade (modified) (5 diffs)
• trunk/src/groupchat_control.py (modified) (3 diffs)

trunk/data/glade/gc_control_popup_menu.glade

@@ -6 +6 @@
-    <child>
-      <widget class="GtkImageMenuItem" id="change_nick_menuitem">
+        <property name="no_show_all">True</property>
-        <property name="label" translatable="yes">Change _Nickname...</property>
-        <property name="use_underline">True</property>
@@ -29 +30 @@
-            <child>
-              <widget class="GtkImageMenuItem" id="change_subject_menuitem">
+                <property name="no_show_all">True</property>
-                <property name="label" translatable="yes">Change _Subject...</property>
-                <property name="use_underline">True</property>
@@ -54 +56 @@
-            </child>
-            <child>
-1
+3
-                <property name="visible">True</property>
-              </widget>
@@ -92 +94 @@
-    </child>
-    <child>
-erator
-visible
+aratormenuitem1
+no_show_all
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="bookmark_room_menuitem">
+        <property name="no_show_all">True</property>
-        <property name="label" translatable="yes">_Bookmark</property>
-        <property name="use_underline">True</property>
@@ -110 +113 @@
-    </child>
-    <child>
-erator
-visible
+aratormenuitem2
+no_show_all
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="history_menuitem">
-tooltip" translatable="yes">Click to see past conversation in this room
+no_show_all">True
-        <property name="label" translatable="yes">_History</property>
-        <property name="use_underline">True</property>

trunk/src/groupchat_control.py

@@ -296 +296 @@
-                self.handlers[id] = self.minimize_menuitem
-
+                self.separatormenuitem1 = xm.get_widget('separatormenuitem1')
+                self.separatormenuitem2 = xm.get_widget('separatormenuitem2')
+
-                self.gc_popup_menu = xm.get_widget('gc_control_popup_menu')
-
@@ -563 +566 @@
-                self.banner_status_label.set_markup(subject_text)
-
-
+, hide_buttonbar_entries = False
-                '''sets sensitivity state for configure_room'''
-                ag = gtk.accel_groups_from_object(self.parent_win.window)[0]
@@ -574 +577 @@
-                self.history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h,
-                        gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+
+                if hide_buttonbar_entries:
+                        self.change_nick_menuitem.hide()
+                        self.change_subject_menuitem.hide()
+                        self.bookmark_room_menuitem.hide()
+                        self.history_menuitem.hide()
+                        self.separatormenuitem1.hide()
+                        self.separatormenuitem2.hide()
+                else:
+                        self.change_nick_menuitem.show()
+                        self.change_subject_menuitem.show()
+                        self.bookmark_room_menuitem.show()
+                        self.history_menuitem.show()
+                        self.separatormenuitem1.show()
+                        self.separatormenuitem2.show()
+
-                if self.contact.jid in gajim.config.get_per('accounts', self.account,
-                'minimized_gc').split(' '):