added label of the current bouquet name

This commit is contained in:
DYefremov
2018-07-09 19:00:05 +03:00
parent 99ecb0f22e
commit 620ff4bd60
2 changed files with 51 additions and 19 deletions

View File

@@ -44,25 +44,23 @@ class MainAppWindow:
_COMMONS_ELEMENTS = ("edit_tool_button", "services_remove_popup_item", "bouquets_remove_popup_item",
"fav_remove_popup_item")
_FAV_ELEMENTS = ("fav_cut_popup_item", "fav_paste_popup_item", "fav_import_m3u_popup_item", "fav_locate_popup_item",
"fav_insert_marker_popup_item", "fav_edit_popup_item", "fav_picon_popup_item",
"fav_add_iptv_popup_item")
_FAV_ELEMENTS = ("fav_cut_popup_item", "fav_paste_popup_item", "fav_locate_popup_item", "fav_iptv_popup_item",
"fav_insert_marker_popup_item", "fav_edit_popup_item", "fav_picon_popup_item")
_FAV_ENIGMA_ELEMENTS = ("fav_insert_marker_popup_item",)
_FAV_M3U_ELEMENTS = ("fav_import_m3u_popup_item", "fav_add_iptv_popup_item")
_FAV_IPTV_ELEMENTS = ("fav_iptv_popup_item",)
_LOCK_HIDE_ELEMENTS = ("locked_tool_button", "hide_tool_button")
_DYNAMIC_ELEMENTS = ("services_create_bouquet_popup_item", "new_tool_button",
"edit_tool_button", "services_to_fav_move_popup_item", "services_edit_popup_item",
"locked_tool_button", "services_remove_popup_item", "fav_cut_popup_item",
"fav_paste_popup_item", "bouquets_new_popup_item", "bouquets_edit_popup_item",
"services_remove_popup_item", "bouquets_remove_popup_item", "fav_remove_popup_item",
"hide_tool_button", "fav_import_m3u_popup_item", "fav_insert_marker_popup_item",
"fav_edit_popup_item", "fav_locate_popup_item", "services_copy_popup_item",
"services_picon_popup_item", "fav_picon_popup_item", "services_add_new_popup_item",
"fav_add_iptv_popup_item")
_DYNAMIC_ELEMENTS = ("services_create_bouquet_popup_item", "new_tool_button", "edit_tool_button",
"services_to_fav_move_popup_item", "services_edit_popup_item", "locked_tool_button",
"services_remove_popup_item", "fav_cut_popup_item", "fav_paste_popup_item",
"bouquets_new_popup_item", "bouquets_edit_popup_item", "services_remove_popup_item",
"bouquets_remove_popup_item", "fav_remove_popup_item", "hide_tool_button",
"fav_insert_marker_popup_item", "fav_edit_popup_item", "fav_locate_popup_item",
"services_copy_popup_item", "services_picon_popup_item", "fav_picon_popup_item",
"services_add_new_popup_item", "fav_iptv_popup_item")
def __init__(self):
handlers = {"on_close_app": self.on_close_app,
@@ -167,6 +165,7 @@ class MainAppWindow:
self._main_window_box = builder.get_object("main_window_box")
self._fav_iptv_mode_popup_item = builder.get_object("fav_iptv_mode_popup_item")
self._profile_label = builder.get_object("profile_label")
self._bq_name_label = builder.get_object("bq_name_label")
self._ip_label = builder.get_object("ip_label")
self._ip_label.set_text(self._options.get(self._profile).get("host"))
self.update_profile_label()
@@ -551,6 +550,8 @@ class MainAppWindow:
""" Opening data and fill views. """
self._wait_dialog.show()
self.clear_current_data()
self._current_bq_name = None
self._bq_name_label.set_text("")
data_path = self._options.get(self._profile).get("data_dir_path") if data_path is None else data_path
try:
@@ -676,6 +677,7 @@ class MainAppWindow:
def on_bouquets_selection(self, model, path, column):
self._current_bq_name = model[path][0] if len(path) > 1 else None
self._bq_name_label.set_text(self._current_bq_name if self._current_bq_name else "")
self._fav_model.clear()
if self._bouquets_view.row_expanded(path):
@@ -838,7 +840,7 @@ class MainAppWindow:
elif elem in self._FAV_ENIGMA_ELEMENTS:
if profile is Profile.ENIGMA_2:
self._tool_elements[elem].set_sensitive(bq_selected and not is_service)
elif elem in self._FAV_M3U_ELEMENTS:
elif elem in self._FAV_IPTV_ELEMENTS:
self._tool_elements[elem].set_sensitive(bq_selected and not is_service)
else:
self._tool_elements[elem].set_sensitive(not_empty and not is_service)

View File

@@ -214,6 +214,7 @@ Author: Dmitriy Yefremov
<property name="relief">none</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="on_data_save" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -359,6 +360,7 @@ Author: Dmitriy Yefremov
<object class="GtkImageMenuItem" id="fav_iptv_popup_item">
<property name="label" translatable="yes">IPTV</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="image">networktransmit_receive_image</property>
<property name="use_stock">False</property>
@@ -378,7 +380,6 @@ Author: Dmitriy Yefremov
<object class="GtkImageMenuItem" id="fav_import_m3u_popup_item">
<property name="label" translatable="yes">Import m3u</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">downloads_image</property>
@@ -390,7 +391,6 @@ Author: Dmitriy Yefremov
<object class="GtkImageMenuItem" id="fav_add_iptv_popup_item">
<property name="label" translatable="yes">Add IPTV or stream service</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="image">network_transmit_receive_image</property>
<property name="use_stock">False</property>
@@ -1876,8 +1876,8 @@ Author: Dmitriy Yefremov
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">0</property>
<property name="width_chars">15</property>
<property name="max_width_chars">15</property>
<property name="width_chars">4</property>
<property name="max_width_chars">4</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -1887,7 +1887,37 @@ Author: Dmitriy Yefremov
</packing>
</child>
<child>
<placeholder/>
<object class="GtkSeparator">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<child>
<object class="GtkLabel" id="bq_name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="ellipsize">end</property>
<property name="width_chars">12</property>
<property name="max_width_chars">20</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>