remove some useless indentation and hide message window until a tab is inserted

This commit is contained in:
Yann Leboulanger 2006-01-12 06:59:59 +00:00
parent 1689ae3783
commit d945166749
1 changed files with 18 additions and 24 deletions

View File

@ -71,7 +71,6 @@ class MessageWindow:
self.notebook.remove_page(0) self.notebook.remove_page(0)
# Tab customizations # Tab customizations
pref_pos = gajim.config.get('tabs_position') pref_pos = gajim.config.get('tabs_position')
if pref_pos != 'top':
if pref_pos == 'bottom': if pref_pos == 'bottom':
nb_pos = gtk.POS_BOTTOM nb_pos = gtk.POS_BOTTOM
elif pref_pos == 'left': elif pref_pos == 'left':
@ -80,8 +79,6 @@ class MessageWindow:
nb_pos = gtk.POS_RIGHT nb_pos = gtk.POS_RIGHT
else: else:
nb_pos = gtk.POS_TOP nb_pos = gtk.POS_TOP
else:
nb_pos = gtk.POS_TOP
self.notebook.set_tab_pos(nb_pos) self.notebook.set_tab_pos(nb_pos)
if gajim.config.get('tabs_always_visible'): if gajim.config.get('tabs_always_visible'):
self.notebook.set_show_tabs(True) self.notebook.set_show_tabs(True)
@ -96,8 +93,6 @@ class MessageWindow:
self.notebook.drag_dest_set(gtk.DEST_DEFAULT_ALL, self.DND_TARGETS, self.notebook.drag_dest_set(gtk.DEST_DEFAULT_ALL, self.DND_TARGETS,
gtk.gdk.ACTION_COPY) gtk.gdk.ACTION_COPY)
self.window.show_all()
def _on_window_focus(self, widget, event): def _on_window_focus(self, widget, event):
# window received focus, so if we had urgency REMOVE IT # window received focus, so if we had urgency REMOVE IT
# NOTE: we do not have to read the message (it maybe in a bg tab) # NOTE: we do not have to read the message (it maybe in a bg tab)
@ -601,8 +596,7 @@ class MessageWindowMgr:
if not gajim.config.get('saveposition'): if not gajim.config.get('saveposition'):
size = (common.config.DEFAULT_WINDOW_WIDTH, size = (common.config.DEFAULT_WINDOW_WIDTH,
common.config.DEFAULT_WINDOW_HEIGHT) common.config.DEFAULT_WINDOW_HEIGHT)
else: elif self.mode == self.CONFIG_NEVER or self.mode == self.CONFIG_ALWAYS:
if self.mode == self.CONFIG_NEVER or self.mode == self.CONFIG_ALWAYS:
size = (gajim.config.get('msgwin-width'), size = (gajim.config.get('msgwin-width'),
gajim.config.get('msgwin-height')) gajim.config.get('msgwin-height'))
elif self.mode == self.CONFIG_PERACCT: elif self.mode == self.CONFIG_PERACCT: