little changes in fav view

This commit is contained in:
DYefremov
2017-10-20 19:03:22 +03:00
parent 2e64fc20f2
commit f881681371
3 changed files with 36 additions and 4 deletions

View File

@@ -1,6 +1,4 @@
""" Module for parsing bouquets """
# temporary
from collections import namedtuple
__BOUQUETS_PATH = "../data/"
@@ -13,6 +11,10 @@ def get_bouquets(path):
return [parse_bouquets(path, "bouquets.tv"), parse_bouquets(path, "bouquets.radio")]
def write_bouquets(path, channels):
pass
def get_bouquet(path, name, type):
with open(path + "userbouquet.{}.{}".format(name, str(type))) as file:
chs_list = file.read()

View File

@@ -45,6 +45,7 @@ def get_handlers():
"on_download": on_download,
"on_upload": on_upload,
"on_data_open": on_data_open,
"on_data_save": on_data_save,
"on_tree_view_key_release": on_tree_view_key_release,
"on_bouquets_selection": on_bouquets_selection,
"on_satellite_editor_show": on_satellite_editor_show,
@@ -162,7 +163,7 @@ def receive_selection(*, view, drop_info, data):
for ext_row in ext_rows:
fav_id = ext_row[11]
channel = __channels[fav_id]
model.insert(dest_index, (0, channel.service, channel.service_type, channel.pos))
model.insert(dest_index, (0, channel.service, channel.service_type, channel.pos, channel.fav_id))
elif source == 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]
@@ -236,6 +237,16 @@ def on_data_open(model):
task.start()
def on_data_save(*args):
# Perhaps needs a dialog to choose what we need to save!!!
if is_bouquet_selected() and __fav_view.is_focus(): # bouquets
fav_ids = []
__fav_model.foreach(lambda model, path, itr: fav_ids.append(model.get(model.get_iter(path), 4)))
print(fav_ids)
elif __services_view.is_focus():
pass
def on_services_selection(model, path, column):
delete_selection(__fav_view)
@@ -254,7 +265,7 @@ def on_bouquets_selection(model, path, column):
bq = get_bouquet(__options["data_dir_path"], name, SERVICE_TYPE[1].lower())
for num, ch_id in enumerate(bq):
channel = __channels.get(ch_id, None)
__fav_model.append((num + 1, channel[0], channel[2], channel[9]))
__fav_model.append((num + 1, channel.service, channel.service_type, channel.pos, channel.fav_id))
def is_bouquet_selected():

View File

@@ -41,6 +41,8 @@
<column type="gchararray"/>
<!-- column-name pos -->
<column type="gchararray"/>
<!-- column-name fav_id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkMenu" id="fav_popup_menu">
@@ -418,6 +420,7 @@
<property name="label" translatable="yes">Save</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-floppy</property>
<signal name="clicked" handler="on_data_save" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -878,6 +881,7 @@
<property name="resizable">True</property>
<property name="sizing">autosize</property>
<property name="title" translatable="yes">Num</property>
<property name="expand">True</property>
<child>
<object class="GtkCellRendererText" id="num_cellrenderertext"/>
<attributes>
@@ -891,6 +895,7 @@
<property name="resizable">True</property>
<property name="sizing">autosize</property>
<property name="title" translatable="yes">Service</property>
<property name="expand">True</property>
<child>
<object class="GtkCellRendererText" id="service_cellrenderertext1"/>
<attributes>
@@ -902,6 +907,7 @@
<child>
<object class="GtkTreeViewColumn" id="type_column">
<property name="title" translatable="yes">Type</property>
<property name="expand">True</property>
<child>
<object class="GtkCellRendererText" id="type_cellrenderertext"/>
<attributes>
@@ -913,6 +919,7 @@
<child>
<object class="GtkTreeViewColumn" id="pos_column">
<property name="title" translatable="yes">Pos</property>
<property name="expand">True</property>
<child>
<object class="GtkCellRendererText" id="pos_cellrenderertext"/>
<attributes>
@@ -921,6 +928,18 @@
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="fav_id_column1">
<property name="visible">False</property>
<property name="title" translatable="yes">fav_id</property>
<child>
<object class="GtkCellRendererText" id="fav_id_cellrenderertext2"/>
<attributes>
<attribute name="text">4</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>