itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some small fixes after discussion and testing over irc

This commit is contained in:
Stephen Boddy 2009-01-12 17:08:12 +01:00
parent b9b5416d8d
commit 29ef912250
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
terminatorlib/terminator.py
View File

@ -134,7 +134,7 @@ class Terminator:
self.term_list = [] self.term_list = []
self.gnome_client = None self.gnome_client = None
self.groupsend = 1 # 0 off, 1 group (d), 2 all self.groupsend = 1 # 0 off, 1 group (d), 2 all
self.splittogroup = 1 # 0 no group, 1 new takes orginators group (d) self.splittogroup = 0 # 0 no group (d), 1 new takes orginators group
self.autocleangroups = 1 # 0 off, 1 on (d) self.autocleangroups = 1 # 0 off, 1 on (d)
stores = [] stores = []
@ -840,11 +840,12 @@ class Terminator:
self.toggle_zoom(widget, not self._maximised) self.toggle_zoom(widget, not self._maximised)
widget_group = widget._group widget_group = widget._group
for term in self.term_list: all_closed = True
for term in self.term_list[:]:
if term._group == widget_group and not self.remove(term): if term._group == widget_group and not self.remove(term):
return False all_closed = False
self.group_hoover() self.group_hoover()
return True return all_closed
def go_to (self, term, selector): def go_to (self, term, selector):
current = self.term_list.index (term) current = self.term_list.index (term)

10
terminatorlib/terminatorterm.py
View File

@ -79,7 +79,6 @@ class TerminatorTerm (gtk.VBox):
self._title = gtk.Label() self._title = gtk.Label()
self._title.show() self._title.show()
self._titlegroup = gtk.Label() self._titlegroup = gtk.Label()
self._titlegroup.show()
self._titlegroupbox = gtk.EventBox () self._titlegroupbox = gtk.EventBox ()
self._titlegroupbox.set_visible_window(True) self._titlegroupbox.set_visible_window(True)
self._titlegrouphbox = gtk.HBox() self._titlegrouphbox = gtk.HBox()
@ -88,6 +87,7 @@ class TerminatorTerm (gtk.VBox):
self._titlegrouphbox.show () self._titlegrouphbox.show ()
self._titlegroupbox.add (self._titlegrouphbox) self._titlegroupbox.add (self._titlegrouphbox)
self._titlegroupbox.show_all() self._titlegroupbox.show_all()
self._titlegroup.hide()
self._titlesep = gtk.VSeparator () self._titlesep = gtk.VSeparator ()
self._titlesep.show() self._titlesep.show()
self._titlebox = gtk.EventBox () self._titlebox = gtk.EventBox ()
@ -1042,7 +1042,7 @@ text/plain
item.set_active (self._titlebox.get_property ('visible')) item.set_active (self._titlebox.get_property ('visible'))
item.connect ("toggled", lambda menu_item: self.do_title_toggle ()) item.connect ("toggled", lambda menu_item: self.do_title_toggle ())
if self._group: if self._group:
item.set_sensitive (False) item.set_sensitive (True)
menu.append (item) menu.append (item)
self._do_encoding_items (menu) self._do_encoding_items (menu)
@ -1181,12 +1181,12 @@ text/plain
widget.append (item) widget.append (item)
if self._group != None: if self._group != None:
item = gtk.MenuItem (_("Ungroup ") + self._group) item = gtk.MenuItem (_("Remove %s group ") % (self._group))
item.connect ("activate", self.ungroup, self._group) item.connect ("activate", self.ungroup, self._group)
widget.append (item) widget.append (item)
if len (self.terminator.groupings) > 0: if len (self.terminator.groupings) > 0:
item = gtk.MenuItem (_("_Ungroup all")) item = gtk.MenuItem (_("Remove all groups"))
item.connect ("activate", self.ungroup_all) item.connect ("activate", self.ungroup_all)
widget.append (item) widget.append (item)
@ -1227,6 +1227,8 @@ text/plain
item = gtk.CheckMenuItem (_("Split to this group")) item = gtk.CheckMenuItem (_("Split to this group"))
item.set_active (self.terminator.splittogroup) item.set_active (self.terminator.splittogroup)
item.connect ("toggled", lambda menu_item: self.do_splittogroup_toggle ()) item.connect ("toggled", lambda menu_item: self.do_splittogroup_toggle ())
if self._group == None:
item.set_sensitive(False)
widget.append (item) widget.append (item)
item = gtk.CheckMenuItem (_("Autoclean groups")) item = gtk.CheckMenuItem (_("Autoclean groups"))