diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2015-01-08 14:37:57 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2015-01-08 14:37:57 +0100 |
| commit | 12119dca307a6f79c89f8c55d0b045b08fcd7c38 (patch) | |
| tree | a737c13daddb26fbd65135ea5f0a6f07b7e89668 | |
| parent | 00e5ec6e9a0d2a02a75e482543b98e17ca2dd54b (diff) | |
grc: inter-domain coloring for messages
| -rw-r--r-- | grc/blocks/gr_message_domain.xml | 1 | ||||
| -rw-r--r-- | grc/gui/Connection.py | 21 |
2 files changed, 10 insertions, 12 deletions
diff --git a/grc/blocks/gr_message_domain.xml b/grc/blocks/gr_message_domain.xml index c1eedb7c8..bc8add99a 100644 --- a/grc/blocks/gr_message_domain.xml +++ b/grc/blocks/gr_message_domain.xml @@ -7,6 +7,7 @@ <domain> <name>GR Message</name> <key>gr_message</key> + <color>#000</color> <multiple_sources>True</multiple_sources> <connection> <source_domain>gr_message</source_domain> diff --git a/grc/gui/Connection.py b/grc/gui/Connection.py index 84004f5af..00343a24c 100644 --- a/grc/gui/Connection.py +++ b/grc/gui/Connection.py @@ -83,18 +83,15 @@ class Connection(Element): ] source_domain = self.get_source().get_domain() sink_domain = self.get_sink().get_domain() - if source_domain == GR_MESSAGE_DOMAIN: - self.line_attributes[1] = gtk.gdk.LINE_ON_OFF_DASH - else: - self.line_attributes[1] = gtk.gdk.LINE_DOUBLE_DASH - if source_domain != sink_domain: - self.line_attributes[0] = 2 - get_domain_color = lambda d: Colors.get_color(( - self.get_parent().get_parent().get_domain(d) or {} - ).get('color') or Colors.DEFAULT_DOMAIN_COLOR_CODE) - self._color = get_domain_color(source_domain) - self._bg_color = get_domain_color(sink_domain) - + self.line_attributes[0] = 2 if source_domain != sink_domain else 0 + self.line_attributes[1] = gtk.gdk.LINE_DOUBLE_DASH \ + if not source_domain == sink_domain == GR_MESSAGE_DOMAIN \ + else gtk.gdk.LINE_ON_OFF_DASH + get_domain_color = lambda d: Colors.get_color(( + self.get_parent().get_parent().get_domain(d) or {} + ).get('color') or Colors.DEFAULT_DOMAIN_COLOR_CODE) + self._color = get_domain_color(source_domain) + self._bg_color = get_domain_color(sink_domain) self._update_after_move() def _update_after_move(self): |