Project

General

Profile

Feature #136 ยป ch_icon.patch

proposed patch - sbi -, 2010-01-16 21:10

View differences:

src/webui/static/app/chconf.js (working copy)
27 27
tvheadend.channels = new Ext.data.JsonStore({
28 28
    autoLoad: true,
29 29
    root:'entries',
30
    fields: ['name', 'chid', 'xmltvsrc', 'tags', 
30
    fields: ['name', 'chid', 'xmltvsrc', 'tags', 'ch_icon',
31 31
	     'epg_pre_start', 'epg_post_end', 'number'],
32 32
    id: 'chid',
33 33
    url: "channels",
......
210 210
		displayField: 'name'
211 211
	    })
212 212
	},
213
	{
214
	    header: "Icon (full URL)",
215
	    dataIndex: 'ch_icon',
216
	    width: 200,
217
	    editor: new fm.TextField()
218
	},
213 219
    {
214 220
        header: "DVR Pre-Start",
215 221
        dataIndex: 'epg_pre_start',
src/webui/extjs.c (working copy)
328 328
    if((s = htsmsg_get_str(c, "xmltvsrc")) != NULL)
329 329
      channel_set_xmltv_source(ch, xmltv_channel_find_by_displayname(s));
330 330

331
    if((s = htsmsg_get_str(c, "ch_icon")) != NULL)
332
      channel_set_icon(ch, s);
333

331 334
    if((s = htsmsg_get_str(c, "tags")) != NULL)
332 335
      channel_set_tags_from_list(ch, s);
333 336

......
374 377
      if(ch->ch_xc != NULL)
375 378
	htsmsg_add_str(c, "xmltvsrc", ch->ch_xc->xc_displayname);
376 379

380
      if(ch->ch_icon != NULL)
381
        htsmsg_add_str(c, "ch_icon", ch->ch_icon);
382

377 383
      buf[0] = 0;
378 384
      LIST_FOREACH(ctm, &ch->ch_ctms, ctm_channel_link) {
379 385
	snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
    (1-1/1)