Remove the noe redundant group menu, plus unique titlebar icons.
This commit is contained in:
parent
29ef912250
commit
eab9cb3757
BIN
data/icons/16x16/actions/terminator_active_broadcast_all.png
Normal file
BIN
data/icons/16x16/actions/terminator_active_broadcast_all.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 273 B |
BIN
data/icons/16x16/actions/terminator_active_broadcast_group.png
Normal file
BIN
data/icons/16x16/actions/terminator_active_broadcast_group.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 277 B |
BIN
data/icons/16x16/actions/terminator_active_broadcast_off.png
Normal file
BIN
data/icons/16x16/actions/terminator_active_broadcast_off.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 272 B |
BIN
data/icons/16x16/actions/terminator_receive_off.png
Normal file
BIN
data/icons/16x16/actions/terminator_receive_off.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 259 B |
BIN
data/icons/16x16/actions/terminator_receive_on.png
Normal file
BIN
data/icons/16x16/actions/terminator_receive_on.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 270 B |
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user