Changeset 80
- Timestamp:
- 07/16/07 17:58:52 (3 years ago)
- Location:
- gajim/branches/chat2muc
- Files:
-
- 2 modified
-
data/glade/chat_to_muc_window.glade (modified) (2 diffs)
-
src/dialogs.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
gajim/branches/chat2muc/data/glade/chat_to_muc_window.glade
r79 r80 81 81 <widget class="GtkLabel" id="info_label"> 82 82 <property name="visible">True</property> 83 <property name="label" translatable="yes"> Enter the JabberID ofthe friends you want to invite.</property>83 <property name="label" translatable="yes">Select the friends you want to invite.</property> 84 84 <property name="use_underline">False</property> 85 85 <property name="use_markup">False</property> … … 100 100 <property name="expand">False</property> 101 101 <property name="fill">False</property> 102 </packing>103 </child>104 105 <child>106 <widget class="GtkEntry" id="jid_entry">107 <property name="visible">True</property>108 <property name="can_focus">True</property>109 <property name="editable">True</property>110 <property name="visibility">True</property>111 <property name="max_length">0</property>112 <property name="text" translatable="yes"></property>113 <property name="has_frame">True</property>114 <property name="invisible_char">●</property>115 <property name="activates_default">False</property>116 </widget>117 <packing>118 <property name="padding">4</property>119 <property name="expand">False</property>120 <property name="fill">False</property>121 </packing>122 </child>123 124 <child>125 <widget class="GtkHBox" id="add_remove_hbox">126 <property name="visible">True</property>127 <property name="homogeneous">False</property>128 <property name="spacing">0</property>129 130 <child>131 <widget class="GtkButton" id="add_button">132 <property name="visible">True</property>133 <property name="can_focus">True</property>134 <property name="label">gtk-add</property>135 <property name="use_stock">True</property>136 <property name="relief">GTK_RELIEF_NORMAL</property>137 <property name="focus_on_click">True</property>138 <signal name="clicked" handler="on_add_button_clicked" last_modification_time="Sun, 15 Jul 2007 08:43:03 GMT"/>139 </widget>140 <packing>141 <property name="padding">0</property>142 <property name="expand">True</property>143 <property name="fill">False</property>144 </packing>145 </child>146 147 <child>148 <widget class="GtkButton" id="remove_button">149 <property name="visible">True</property>150 <property name="can_focus">True</property>151 <property name="label">gtk-remove</property>152 <property name="use_stock">True</property>153 <property name="relief">GTK_RELIEF_NORMAL</property>154 <property name="focus_on_click">True</property>155 <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Sun, 15 Jul 2007 08:43:13 GMT"/>156 </widget>157 <packing>158 <property name="padding">0</property>159 <property name="expand">True</property>160 <property name="fill">False</property>161 </packing>162 </child>163 </widget>164 <packing>165 <property name="padding">0</property>166 <property name="expand">False</property>167 <property name="fill">True</property>168 102 </packing> 169 103 </child> -
gajim/branches/chat2muc/src/dialogs.py
r76 r80 3268 3268 3269 3269 self.account = account 3270 self.auto_jids = jids 3270 3271 3271 3272 self.xml = gtkgui_helpers.get_glade('chat_to_muc_window.glade') … … 3273 3274 3274 3275 for widget_to_add in ('invite_button', 'cancel_button', 3275 'server_list_comboboxentry', 'jid_entry', 'add_button', 3276 'remove_button', 'guests_treeview', 'server_and_guests_hseparator', 3277 'server_select_label'): 3276 'server_list_comboboxentry', 'guests_treeview', 3277 'server_and_guests_hseparator', 'server_select_label'): 3278 3278 self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add) 3279 3280 # set jabber id completion3281 jids_list_store = gtk.ListStore(gobject.TYPE_STRING)3282 for jid in gajim.contacts.get_jid_list(self.account):3283 jids_list_store.append([jid])3284 jid_entry_completion = gtk.EntryCompletion()3285 jid_entry_completion.set_text_column(0)3286 jid_entry_completion.set_model(jids_list_store)3287 jid_entry_completion.set_popup_completion(True)3288 self.jid_entry.set_completion(jid_entry_completion)3289 3279 3290 3280 # set a list of servers which support it … … 3305 3295 3306 3296 # set treeview 3307 renderer = gtk.CellRendererText() 3308 3309 self.store = gtk.ListStore(str) 3297 3298 self.store = gtk.ListStore(str, str) 3310 3299 self.guests_treeview.set_model(self.store) 3311 3300 3312 column = gtk.TreeViewColumn('Contact', renderer, text=0) 3301 renderer1 = gtk.CellRendererText() 3302 column = gtk.TreeViewColumn('Name', renderer1, text=0) 3313 3303 self.guests_treeview.append_column(column) 3314 3304 3315 self.store.append(jids) 3305 self.guests_treeview.get_selection().set_mode(gtk.SELECTION_MULTIPLE) 3306 3307 # set jabber id and pseudos 3308 for jid in gajim.contacts.get_jid_list(self.account): 3309 contact = \ 3310 gajim.contacts.get_contact_with_highest_priority(self.account, jid) 3311 if contact.jid not in self.auto_jids: 3312 if contact.show not in ('offline', 'error'): 3313 name = contact.name 3314 if name == '': 3315 name = jid.split('@')[0] 3316 self.store.append([name, jid]) 3316 3317 3317 3318 # show all but... … … 3338 3339 self.servers_support[server] = room_id 3339 3340 guest_list = [] 3340 iter = self.store.get_iter_root() 3341 while iter: 3342 guest = self.store[iter][0].decode('utf-8') 3341 guests = self.guests_treeview.get_selection().get_selected_rows() 3342 for guest in guests[1]: 3343 iter = self.store.get_iter(guest) 3344 guest_list.append(self.store[iter][1].decode('utf-8')) 3345 for guest in self.auto_jids: 3343 3346 guest_list.append(guest) 3344 iter = self.store.iter_next(iter) 3347 #iter = self.store.get_iter_root() 3348 #while iter: 3349 # guest = self.store[iter][0].decode('utf-8') 3350 # guest_list.append(guest) 3351 # iter = self.store.iter_next(iter) 3345 3352 room_jid = room_id + '@' + server 3346 3353 gajim.automatic_rooms[self.account][room_jid] = {} … … 3356 3363 self.unique_room_id_supported(server, 3357 3364 gajim.nicks[self.account] + str(randrange(9999999))) 3358 3359 def on_add_button_clicked(self, widget):3360 if self.jid_entry.get_text() == '':3361 return3362 self.store.append([self.jid_entry.get_text()])3363 self.jid_entry.set_text('')3364 3365 def on_remove_button_clicked(self, widget):3366 if self.guests_treeview.get_selection().get_selected()[1] == None:3367 return3368 guest_selected = self.guests_treeview.get_selection().get_selected()[1]3369 self.store.remove(guest_selected)
