From eab9cb37570db9510f776ff60cc939135603bbe5 Mon Sep 17 00:00:00 2001
From: Stephen Boddy <stephen.j.boddy@gmail.com>
Date: Mon, 12 Jan 2009 22:53:42 +0100
Subject: [PATCH] Remove the noe redundant group menu, plus unique titlebar
 icons.

---
 .../terminator_active_broadcast_all.png       | Bin 0 -> 273 bytes
 .../terminator_active_broadcast_group.png     | Bin 0 -> 277 bytes
 .../terminator_active_broadcast_off.png       | Bin 0 -> 272 bytes
 .../16x16/actions/terminator_receive_off.png  | Bin 0 -> 259 bytes
 .../16x16/actions/terminator_receive_on.png   | Bin 0 -> 270 bytes
 terminatorlib/terminatorterm.py               |  27 +++++++++---------
 6 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 data/icons/16x16/actions/terminator_active_broadcast_all.png
 create mode 100644 data/icons/16x16/actions/terminator_active_broadcast_group.png
 create mode 100644 data/icons/16x16/actions/terminator_active_broadcast_off.png
 create mode 100644 data/icons/16x16/actions/terminator_receive_off.png
 create mode 100644 data/icons/16x16/actions/terminator_receive_on.png

diff --git a/data/icons/16x16/actions/terminator_active_broadcast_all.png b/data/icons/16x16/actions/terminator_active_broadcast_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..95d420c4f8dd73ff01200c80f9435d35f5e9dbf7
GIT binary patch
literal 273
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggaMjjDe#h>;DAaf;4Tq8=H^K)}k
z^GX<;i&7IyQd1PlGfOfQ+&z5*!W;R-fr@fGT^vI!PAA)J$hT)!ZRl)tI>3}{VPW}C
zJ@j*9?QhA*39Nnw2FV(m5`LUM5Ktx*Tt3~hbdLcKPr^YCgB%8_1Qy-{qPN(;y-i=z
zFaCishx6@$eSdp=mMpQ#sZk4>thXys=SZ8G-gJYYS#ueuq$^#R@o;Sw&|U^lS3j3^
HP6<r_+0R!5

literal 0
HcmV?d00001

diff --git a/data/icons/16x16/actions/terminator_active_broadcast_group.png b/data/icons/16x16/actions/terminator_active_broadcast_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..612689c25f849c8244c72b9c3af2eb1564202841
GIT binary patch
literal 277
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggaMjjDuGo5WhKsg4<64!_l=ltB<
z)VvY~=c3falGGH1^30M91$R&1fbd2>aiF3CPZ!4!i_^(A8}jX$RU0}RoenT1TUc2B
zQxE;zSo>QtassQLfkCpyri34-4+NA61(#2^EZt+k!;^53!yt!2DuIRfz_b-Ib7Um>
z-rPR#A+P^{`G(Lfkj|MNo~1W__$*P2Ejb)<fw?DSx<Syaxs3kR%9jMbzS#t{o59o7
K&t;ucLK6U}`&YLB

literal 0
HcmV?d00001

diff --git a/data/icons/16x16/actions/terminator_active_broadcast_off.png b/data/icons/16x16/actions/terminator_active_broadcast_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..981c51cda8c87d76b3dafac364220b114c5984ce
GIT binary patch
literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggaMjjDersxPq1)z{*iEBiObAE1a
zYF-J0b5UwyNotBhd1gt5g1e`0KzJjcI8afxr;B5V#pz_54f*!WstuiuP6wEhEi5em
zsfT`Uto<z+If2#Bz#v&;Q^Jqa4QFTb`So4-c*ww@fz|fF2F8d6K@*1X4EY<|=TEeY
zJHWm{bqn+FZ^lLwC%xM6ai)jwt`}_^1*C87h&kkuS;odtU8Qp6j;gZ_&{_shS3j3^
HP6<r_uOe6S

literal 0
HcmV?d00001

diff --git a/data/icons/16x16/actions/terminator_receive_off.png b/data/icons/16x16/actions/terminator_receive_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..d232f63f0b2aca5ac834a61b3a5dd280785f2894
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggaMjjD;BmeEfd_W<|64!_l=ltB<
z)VvY~=c3falGGH1^30M91$R&1fbd2>aiF3&PZ!4!i_^(A8}jX$RU0}RoenT1TUc2B
zQxE;zSo>Qt@&b#2h^2+)Ba!7@;%$wLIyacu!W#rl82oh%E*<Co!LY5REa85gn_5ti
steKtgN>A~-24YFh($l>qG|!%6c=SOv>B`Ei6rfEEp00i_>zopr02o|MSO5S3

literal 0
HcmV?d00001

diff --git a/data/icons/16x16/actions/terminator_receive_on.png b/data/icons/16x16/actions/terminator_receive_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..98517c892f824359749cb779dea5d752302cc3bd
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggaMjjD;d9DoqYM_v0iEBiObAE1a
zYF-J0b5UwyNotBhd1gt5g1e`0KzJjcI8afhr;B5V#pz_54f*!WstuiuP6wEhEi5em
zsfT`Uto<z+8Q^ltFKN{)qx1vMeA(6AUsWVZNE~RAOSr+HbAUstL3<1To7?9-)b$@Q
z-VnM4(lOJ+v-HLfpCxLsC5IzAcynX)5|@}*Gc(LPsFJ`CZLl9`DTAl0pUXO@geCys
C`&6|6

literal 0
HcmV?d00001

diff --git a/terminatorlib/terminatorterm.py b/terminatorlib/terminatorterm.py
index dc8e437f..a81d86ae 100755
--- a/terminatorlib/terminatorterm.py
+++ b/terminatorlib/terminatorterm.py
@@ -1117,17 +1117,6 @@ text/plain
     item = gtk.MenuItem ()
     menu.append (item)
 
-    item = gtk.MenuItem (_("_Group"))
-    menu.append (item)
-    submenu = gtk.Menu ()
-    item.set_submenu (submenu)
-    self.populate_grouping_menu (submenu)
-    if len (self.terminator.term_list) == 1:
-      item.set_sensitive (False)
-
-    item = gtk.MenuItem ()
-    menu.append (item)
-
     item = gtk.ImageMenuItem (gtk.STOCK_CLOSE)
     item.connect ("activate", lambda menu_item: self.terminator.closeterm (self))
     menu.append (item)
@@ -1409,32 +1398,42 @@ text/plain
 
   def on_vte_focus_in(self, vte, event):
     for term in self.terminator.term_list:
+      idx = self.terminator.term_list.index(term)
       if term != self and term._group != None and term._group == self._group:
+        # Not active, group is not none, and in active's group
         if self.terminator.groupsend == 0:
           term._title.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_ia_txt_color))
           term._titlebox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_ia_bg_color))
+          term._titlegroupimg.set_from_icon_name (APP_NAME + '_receive_off', gtk.ICON_SIZE_MENU)
         else:
           term._title.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_rx_txt_color))
           term._titlebox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_rx_bg_color))
+          term._titlegroupimg.set_from_icon_name (APP_NAME + '_receive_on', gtk.ICON_SIZE_MENU)
         term._titlegroup.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_rx_txt_color))
         term._titlegroupbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_rx_bg_color))
-        # set text to white
       elif term != self and term._group == None or term._group != self._group:
+        # Not active, group is not none, not in active's group
         if self.terminator.groupsend == 2:
           term._title.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_rx_txt_color))
           term._titlebox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_rx_bg_color))
+          term._titlegroupimg.set_from_icon_name (APP_NAME + '_receive_on', gtk.ICON_SIZE_MENU)
         else:
           term._title.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_ia_txt_color))
           term._titlebox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_ia_bg_color))
+          term._titlegroupimg.set_from_icon_name (APP_NAME + '_receive_off', gtk.ICON_SIZE_MENU)
         term._titlegroup.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_ia_txt_color))
         term._titlegroupbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_ia_bg_color))
-        # set text to black
       else:
         term._title.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_tx_txt_color))
         term._titlegroup.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_tx_txt_color))
         term._titlebox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_tx_bg_color))
         term._titlegroupbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse (self.conf.title_tx_bg_color))
-        # set text to white
+        if self.terminator.groupsend == 2:
+          term._titlegroupimg.set_from_icon_name (APP_NAME + '_active_broadcast_all', gtk.ICON_SIZE_MENU)
+        elif self.terminator.groupsend == 1:
+          term._titlegroupimg.set_from_icon_name (APP_NAME + '_active_broadcast_group', gtk.ICON_SIZE_MENU)
+        else:
+          term._titlegroupimg.set_from_icon_name (APP_NAME + '_active_broadcast_off', gtk.ICON_SIZE_MENU)
     return
 
   def on_vte_focus_out(self, vte, event):