copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

status combobox is now defined in glade

Browse source
This commit is contained in:
Yann Leboulanger 2005-06-21 14:45:23 +00:00
parent a05392dcde
commit 2db9ac75e0
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gtkgui.glade
View file

@ -321,7 +321,14 @@
</child> </child>
<child> <child>
<placeholder/> <widget class="GtkComboBox" id="status_combobox">
<property name="visible">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child> </child>
</widget> </widget>
</child> </child>

21
src/roster_window.py
View file

@ -1813,14 +1813,6 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
self.window.resize(gajim.config.get('width'), \ self.window.resize(gajim.config.get('width'), \
gajim.config.get('height')) gajim.config.get('height'))
if gajim.config.get('show_roster_on_startup'):
self.window.show_all()
else:
if not gajim.config.get('trayicon'):
# cannot happen via GUI, but I put this incase user touches config
self.window.show_all() # without trayicon, he should see the roster!
gajim.config.set('show_roster_on_startup', True)
self.groups = {} self.groups = {}
self.contacts = {} self.contacts = {}
self.newly_added = {} self.newly_added = {}
@ -1852,9 +1844,7 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
liststore = gtk.ListStore(str, gtk.Image, liststore = gtk.ListStore(str, gtk.Image,
str) str)
self.status_combobox = gtk.ComboBox() self.status_combobox = self.xml.get_widget('status_combobox')
roster_vbox = self.xml.get_widget('roster_vbox')
roster_vbox.pack_end(self.status_combobox, False)
cell = cell_renderer_image.CellRendererImage() cell = cell_renderer_image.CellRendererImage()
self.status_combobox.pack_start(cell, False) self.status_combobox.pack_start(cell, False)
self.status_combobox.add_attribute(cell, 'image', 1) self.status_combobox.add_attribute(cell, 'image', 1)
@ -1868,7 +1858,6 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
uf_show = helpers.get_uf_show(show) uf_show = helpers.get_uf_show(show)
iter = liststore.append([uf_show, self.jabber_state_images[show], iter = liststore.append([uf_show, self.jabber_state_images[show],
show]) show])
self.status_combobox.show_all()
self.status_combobox.set_model(liststore) self.status_combobox.set_model(liststore)
self.status_combobox.set_active(6) # default to offline self.status_combobox.set_active(6) # default to offline
@ -1917,3 +1906,11 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
if len(gajim.connections) == 0: # if no account if len(gajim.connections) == 0: # if no account
self.plugin.windows['account_modification'] = \ self.plugin.windows['account_modification'] = \
config.AccountModificationWindow(self.plugin) config.AccountModificationWindow(self.plugin)
if gajim.config.get('show_roster_on_startup'):
self.window.show_all()
else:
if not gajim.config.get('trayicon'):
# cannot happen via GUI, but I put this incase user touches config
self.window.show_all() # without trayicon, he should see the roster!
gajim.config.set('show_roster_on_startup', True)