From fd5ba2796bf80de63dab431b9789584e0f777141 Mon Sep 17 00:00:00 2001
From: "Mark J. Fine" <mark.fine@fineware-swl.com>
Date: Thu, 22 Dec 2022 16:08:42 -0500
Subject: [PATCH] Fill some of the dead space in wide mode with station
messages/alerts
---
nrsc5-dui.py | 16 ++++++++++++++
res/mainForm-wide.glade | 47 +++++++++++++++++++++++++++++++++++++++--
2 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/nrsc5-dui.py b/nrsc5-dui.py
index e763859..396940a 100644
--- a/nrsc5-dui.py
+++ b/nrsc5-dui.py
@@ -1102,8 +1102,14 @@ class NRSC5_DUI(object):
self.lblSlogan.set_tooltip_text(self.streamInfo["Slogan"])
self.lblMessage.set_label(self.streamInfo["Message"])
self.lblMessage.set_tooltip_text(self.streamInfo["Message"])
+ if (self.txtMessage2):
+ self.txtMessage2.set_label(self.streamInfo["Message"])
+ self.txtMessage2.set_tooltip_text(self.streamInfo["Message"])
self.lblAlert.set_label(self.streamInfo["Alert"])
self.lblAlert.set_tooltip_text(self.streamInfo["Alert"])
+ if (self.txtAlert2):
+ self.txtAlert2.set_label(self.streamInfo["Alert"])
+ self.txtAlert2.set_tooltip_text(self.streamInfo["Alert"])
self.set_button_name(self.btnAudioPrgs0,self.btnAudioLbl0,0)
self.set_button_name(self.btnAudioPrgs1,self.btnAudioLbl1,1)
self.set_button_name(self.btnAudioPrgs2,self.btnAudioLbl2,2)
@@ -1653,6 +1659,8 @@ class NRSC5_DUI(object):
self.lblSlogan = builder.get_object("lblSlogan")
self.lblMessage = builder.get_object("lblMessage")
self.lblAlert = builder.get_object("lblAlert")
+ self.txtMessage2 = builder.get_object("txtMessage2")
+ self.txtAlert2 = builder.get_object("txtAlert2")
self.btnAudioPrgs0 = builder.get_object("btn_audio_prgs0")
self.btnAudioPrgs1 = builder.get_object("btn_audio_prgs1")
self.btnAudioPrgs2 = builder.get_object("btn_audio_prgs2")
@@ -1779,6 +1787,14 @@ class NRSC5_DUI(object):
self.lblSlogan.set_tooltip_text("")
self.lblMessage.set_label("")
self.lblMessage.set_tooltip_text("")
+ if (self.txtMessage2):
+ self.txtMessage2.set_label("")
+ self.txtMessage2.set_tooltip_text("")
+ self.lblAlert.set_label("")
+ self.lblAlert.set_tooltip_text("")
+ if (self.txtAlert2):
+ self.txtAlert2.set_label("")
+ self.txtAlert2.set_tooltip_text("")
self.btnAudioPrgs0.set_sensitive(False)
self.btnAudioPrgs1.set_sensitive(False)
self.btnAudioPrgs2.set_sensitive(False)
diff --git a/res/mainForm-wide.glade b/res/mainForm-wide.glade
index 9e49958..4d5f6cf 100644
--- a/res/mainForm-wide.glade
+++ b/res/mainForm-wide.glade
@@ -2187,13 +2187,16 @@
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkAlignment" id="alignmentInfo">
+ <!--object class="GtkAlignment" id="alignmentInfo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">6</property>
- <property name="right_padding">6</property>
+ <property name="right_padding">6</property-->
+ <object class="GtkVBox" id="vBoxInfo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="tableInfo">
<property name="visible">True</property>
@@ -2338,6 +2341,46 @@
</child>
</object>
</child>
+ <child>
+ <object class="GtkTable" id="tableOther">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">1</property>
+ <child>
+ <object class="GtkLabel" id="txtMessage2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="ypad">10</property>
+ <property name="halign">GTK_ALIGN_FILL</property>
+ <property name="single_line_mode">False</property>
+ <property name="wrap-mode">PANGO_WRAP_WORD</property>
+ <property name="lines">2</property>
+ </object>
+ <packing>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="txtAlert2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">10</property>
+ <property name="ypad">10</property>
+ <property name="halign">GTK_ALIGN_FILL</property>
+ <property name="single_line_mode">False</property>
+ <property name="wrap-mode">PANGO_WRAP_WORD</property>
+ <property name="lines">2</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ </child>
</object>
</child>
<child type="label">