From 9e0d8840f34f791477cf474b689bf6e1150abd13 Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Fri, 23 Mar 2018 21:42:54 +0300
Subject: [PATCH] init neutrino ui elms for service dialog

---
 app/ui/service_details_dialog.glade | 71 +++++++++++++++--------------
 app/ui/service_details_dialog.py    | 16 +++----
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/app/ui/service_details_dialog.glade b/app/ui/service_details_dialog.glade
index 18affe6f..a1e9da17 100644
--- a/app/ui/service_details_dialog.glade
+++ b/app/ui/service_details_dialog.glade
@@ -396,30 +396,6 @@
                     <property name="top_attach">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">CA ID's</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">4</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="cas_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="width_chars">15</property>
-                    <property name="primary_icon_stock">gtk-edit</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">4</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkComboBox" id="service_type_combo_box">
                     <property name="visible">True</property>
@@ -453,6 +429,31 @@
                     <property name="top_attach">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="reference_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Reference</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">4</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="reference_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="editable">False</property>
+                    <property name="width_chars">14</property>
+                    <property name="max_width_chars">14</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">4</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -461,7 +462,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparator" id="separator4">
+              <object class="GtkSeparator" id="srv_separator">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
@@ -764,7 +765,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="box1">
+              <object class="GtkBox" id="flags_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
@@ -853,11 +854,12 @@
                     <property name="can_focus">False</property>
                     <property name="column_spacing">2</property>
                     <child>
-                      <object class="GtkEntry" id="reference_entry">
+                      <object class="GtkEntry" id="cas_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="editable">False</property>
-                        <property name="width_chars">24</property>
+                        <property name="width_chars">15</property>
+                        <property name="max_width_chars">26</property>
+                        <property name="primary_icon_stock">gtk-edit</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -865,10 +867,10 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="reference_label">
+                      <object class="GtkLabel" id="caid_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Reference: </property>
+                        <property name="label" translatable="yes">CAID's:</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -923,8 +925,9 @@
                   <object class="GtkLabel" id="transponder_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="margin_left">5</property>
                     <property name="label" translatable="yes">Transponder data:</property>
-                    <property name="xalign">0.0099999997764825821</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1220,7 +1223,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Tr. ID</property>
+                        <property name="label" translatable="yes">TID</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -1246,7 +1249,7 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Net.  ID</property>
+                        <property name="label" translatable="yes">NID</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
diff --git a/app/ui/service_details_dialog.py b/app/ui/service_details_dialog.py
index 91b620a7..1cd46efe 100644
--- a/app/ui/service_details_dialog.py
+++ b/app/ui/service_details_dialog.py
@@ -42,6 +42,7 @@ class ServiceDetailsDialog:
         builder.set_translation_domain(TEXT_DOMAIN)
         builder.add_from_file(UI_RESOURCES_PATH + "service_details_dialog.glade")
         builder.connect_signals(handlers)
+        self._builder = builder
 
         self._dialog = builder.get_object("service_details_dialog")
         self._dialog.set_transient_for(transient)
@@ -182,7 +183,7 @@ class ServiceDetailsDialog:
             self.init_enigma2_transponder_data(srv)
         elif self._profile is Profile.NEUTRINO_MP:
             self.init_neutrino_data(srv)
-            self.init_enigma_ui_elements()
+            self.init_neutrino_ui_elements()
 
     # ***************** Init Enigma2 data *********************#
 
@@ -269,13 +270,12 @@ class ServiceDetailsDialog:
         self._network_id_entry.set_text(str(int(tr_data[1], 16)))
         self.select_active_text(self._invertion_combo_box, Inversion(tr_data[3]).name)
 
-    def init_enigma_ui_elements(self):
-        self._pids_grid.set_sensitive(False)
-        self._cas_entry.set_sensitive(False)
-        self._keep_check_button.set_sensitive(False)
-        self._hide_check_button.set_sensitive(False)
-        self._use_pids_check_button.set_sensitive(False)
-        self._new_check_button.set_sensitive(False)
+    def init_neutrino_ui_elements(self):
+        self._builder.get_object("flags_box").set_visible(False)
+        self._builder.get_object("pids_grid").set_visible(False)
+        self._builder.get_object("tr_grid").remove_column(7)
+        self._builder.get_object("extra_transponder_grid").remove_column(8)
+        self._builder.get_object("srv_separator").set_visible(False)
 
     # ***************** Init Sat positions *********************#