little gui changes

This commit is contained in:
DYefremov
2018-08-15 10:51:19 +03:00
parent ea9ea98e1a
commit 32f33815c2
3 changed files with 26 additions and 77 deletions

View File

@@ -155,14 +155,8 @@ class MainAppWindow:
self._services_model = builder.get_object("services_list_store")
self._bouquets_model = builder.get_object("bouquets_tree_store")
self._status_bar = builder.get_object("status_bar")
# self._player_frame = builder.get_object("player_frame")
# self._player_drawing_area = builder.get_object("player_drawing_area")
# # enabling events for the drawing area
# self._player_drawing_area.set_events(Gdk.ModifierType.BUTTON1_MASK)
# self._drawing_area_xid = None
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._header_bar = builder.get_object("header_bar")
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"))
@@ -1136,9 +1130,9 @@ class MainAppWindow:
def update_profile_label(self):
profile = Profile(self._profile)
if profile is Profile.ENIGMA_2:
self._profile_label.set_text("Enigma2 v.{}".format(self.get_format_version()))
self._header_bar.set_subtitle("{} Enigma2 v.{}".format(get_message("Profile:"), self.get_format_version()))
elif profile is Profile.NEUTRINO_MP:
self._profile_label.set_text("Neutrino-MP")
self._header_bar.set_subtitle("{} Neutrino-MP".format(get_message("Profile:")))
def get_format_version(self):
return 5 if self._options.get(self._profile).get("v5_support", False) else 4

View File

@@ -317,7 +317,7 @@ Author: Dmitriy Yefremov
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="separatormenuitem3">
<object class="GtkSeparatorMenuItem" id="fav_pupup_separator_8">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -334,7 +334,7 @@ Author: Dmitriy Yefremov
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="fav_pupup_separator_1">
<object class="GtkSeparatorMenuItem" id="fav_pupup_separator_9">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -379,6 +379,12 @@ Author: Dmitriy Yefremov
<signal name="activate" handler="on_play_stream" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="fav_pupup_separator_6">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="fav_import_m3u_popup_item">
<property name="label" translatable="yes">Import m3u</property>
@@ -400,6 +406,12 @@ Author: Dmitriy Yefremov
<signal name="activate" handler="on_iptv" swapped="no"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="fav_pupup_separator_7">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="fav_remove_all_unavailable_popup_item">
<property name="label" translatable="yes">Remove all unavailable</property>
@@ -668,6 +680,8 @@ Author: Dmitriy Yefremov
<object class="GtkHeaderBar" id="header_bar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">DemonEditor</property>
<property name="subtitle" translatable="yes">Profile:</property>
<property name="spacing">1</property>
<property name="show_close_button">True</property>
<child>
@@ -858,70 +872,6 @@ Author: Dmitriy Yefremov
</child>
</object>
</child>
<child type="title">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">DemonEditor</property>
<attributes>
<attribute name="size" value="10000"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="prifile_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Profile:</property>
<attributes>
<attribute name="size" value="8000"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="profile_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">Enigma 2 v.4</property>
<attributes>
<attribute name="size" value="8000"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child>
<object class="GtkBox" id="right_header_box">
<property name="visible">True</property>
@@ -1087,6 +1037,7 @@ Author: Dmitriy Yefremov
<property name="can_focus">False</property>
<child>
<object class="GtkSearchEntry" id="search_entry">
<property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="primary_icon_name">edit-find-symbolic</property>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<!-- interface-css-provider-path style.css -->
@@ -23,12 +23,16 @@
<property name="can_focus">False</property>
<property name="title" translatable="yes">Picons download tool</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">emblem-photos</property>
<property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="picons_dialog_vbox">
<property name="width_request">320</property>
<property name="width_request">570</property>
<property name="can_focus">False</property>
<property name="margin_left">2</property>
<property name="margin_right">2</property>