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

Merge a branch from Stephen J Boddy that adds default group names

This commit is contained in:
Chris Jones 2013-01-30 13:23:35 +00:00
parent 246b0dc229 a7948207df
commit 30e3665005
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
terminatorlib/titlebar.py
View File

@ -5,6 +5,8 @@
import gtk import gtk
import gobject import gobject
import random
import itertools
from version import APP_NAME from version import APP_NAME
from util import dbg from util import dbg
@ -214,6 +216,7 @@ class Titlebar(gtk.EventBox):
self.grouplabel.set_text(name) self.grouplabel.set_text(name)
self.grouplabel.show() self.grouplabel.show()
else: else:
self.grouplabel.set_text('')
self.grouplabel.hide() self.grouplabel.hide()
self.update_visibility() self.update_visibility()
@ -235,6 +238,20 @@ class Titlebar(gtk.EventBox):
"""Create a new group""" """Create a new group"""
if self.terminal.group: if self.terminal.group:
self.groupentry.set_text(self.terminal.group) self.groupentry.set_text(self.terminal.group)
else:
defaultmembers=['Alpha','Beta','Gamma','Delta','Epsilon','Zeta','Eta',
'Theta','Iota','Kappa','Lambda','Mu','Nu','Xi',
'Omnicron','Pi','Rho','Sigma','Tau','Upsilon','Phi',
'Chi','Psi','Omega']
currentgroups=set(self.terminator.groups)
for i in range(1,4):
defaultgroups=set(map(''.join, list(itertools.product(defaultmembers,repeat=i))))
freegroups = list(defaultgroups-currentgroups)
if freegroups:
self.groupentry.set_text(random.choice(freegroups))
break
else:
self.groupentry.set_text('')
self.groupentry.show() self.groupentry.show()
self.grouplabel.hide() self.grouplabel.hide()
self.groupentry.grab_focus() self.groupentry.grab_focus()
@ -249,7 +266,7 @@ class Titlebar(gtk.EventBox):
def groupentry_activate(self, widget): def groupentry_activate(self, widget):
"""Actually cause a group to be created""" """Actually cause a group to be created"""
groupname = self.groupentry.get_text() groupname = self.groupentry.get_text() or None
dbg('Titlebar::groupentry_activate: creating group: %s' % groupname) dbg('Titlebar::groupentry_activate: creating group: %s' % groupname)
self.groupentry_cancel(None, None) self.groupentry_cancel(None, None)
last_focused_term=self.terminator.last_focused_term last_focused_term=self.terminator.last_focused_term