Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-07-11 22:32:22 +02:00
Code Issues Packages Projects Releases Activity

some fixes

Browse Source
This commit is contained in:
Dmitriy Yefremov
2017-11-26 14:55:57 +03:00
parent c95ca097f0
commit 8f1a828228
3 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/eparser/lamedb.py
View File

@@ -79,7 +79,7 @@ def parse_channels(services, transponders, path):
""" Parsing channels """
channels = []
transponders = parse_transponders(transponders)
blacklist = get_blacklist(path)
blacklist = str(get_blacklist(path))
srv = split(services, 3)
if srv[0][0] == "": # remove first empty element
@@ -95,7 +95,7 @@ def parse_channels(services, transponders, path):
coded = CODED_ICON if list(filter(lambda x: x.startswith("C:"), all_flags)) else None
flags = list(filter(lambda x: x.startswith("f:"), all_flags))
hide = HIDE_ICON if flags and int(flags[0][2:]) == 2 else None
locked = LOCKED_ICON if blacklist and fav_id in blacklist else None
locked = LOCKED_ICON if fav_id in blacklist else None
package = list(filter(lambda x: x.startswith("p:"), all_flags))
package = package[0][2:] if package else None

16
app/ui/main_app_window.py
View File

@@ -202,7 +202,7 @@ class MainAppWindow:
model, paths = selection.get_selected_rows()
model_name = model.get_name()
itrs = [model.get_iter(path) for path in paths]
rows = [model.get(in_itr, *[x for x in range(view.get_n_columns())]) for in_itr in itrs]
rows = [model.get(in_itr, *[x for x in range(model.get_n_columns())]) for in_itr in itrs]
bq_selected = self.is_bouquet_selected()
fav_bouquet = None
@@ -236,8 +236,9 @@ class MainAppWindow:
fav_id = row[-2]
for bq in self.__bouquets:
services = self.__bouquets[bq]
with suppress(ValueError):
services.remove(fav_id)
if services:
with suppress(ValueError):
services.remove(fav_id)
self.__channels.pop(fav_id, None)
self.__fav_model.clear()
@@ -350,19 +351,18 @@ class MainAppWindow:
if source == self._SERVICE_LIST_NAME:
ext_model = self.__services_view.get_model()
ext_itrs = [ext_model.get_iter_from_string(itr) for itr in itrs]
ext_rows = [ext_model.get(ext_itr, *[x for x in range(self.__services_view.get_n_columns())]) for
ext_itr in
ext_itrs]
ext_rows = [ext_model.get(ext_itr, *[x for x in range(ext_model.get_n_columns())]) for
ext_itr in ext_itrs]
dest_index -= 1
for ext_row in ext_rows:
dest_index += 1
fav_id = ext_row[13]
fav_id = ext_row[-2]
channel = self.__channels[fav_id]
model.insert(dest_index, (0, channel.service, channel.service_type, channel.pos, channel.fav_id))
fav_bouquet.insert(dest_index, channel.fav_id)
elif source == self._FAV_LIST_NAME:
in_itrs = [model.get_iter_from_string(itr) for itr in itrs]
in_rows = [model.get(in_itr, *[x for x in range(view.get_n_columns())]) for in_itr in in_itrs]
in_rows = [model.get(in_itr, *[x for x in range(model.get_n_columns())]) for in_itr in in_itrs]
for row in in_rows:
model.insert(dest_index, row)
fav_bouquet.insert(dest_index, row[4])

38
app/ui/main_window.glade
View File

@@ -1030,43 +1030,6 @@
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="hide_check_button">
<property name="label" translatable="yes">Hide</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="resize_mode">queue</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_hide" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="lock_check_button">
<property name="label" translatable="yes">Locked</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="resize_mode">queue</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_locked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">5</property>
<property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
@@ -1082,7 +1045,6 @@
</child>
<child>
<object class="GtkPaned" id="fav_bouquets_paned">
<property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="wide_handle">True</property>