Changeset 38791 for titan


Ignore:
Timestamp:
09/15/16 12:51:31 (6 years ago)
Author:
obi
Message:

skinadjust add gepg selection

Location:
titan/titan
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/gmultiepg.h

    r35220 r38791  
    511511{
    512512        int rcret = 0, ret = 0, epgscreenconf = 0, end = 0;
    513         struct skin* gmultiepg = getscreen("gmultiepg");
     513
     514        char* gmultiepg_sel = getskinconfig("gmultiepg_selection", NULL);
     515        debug(10, "get initial gmultiepg=%s", gmultiepg_sel);
     516
     517        if(gmultiepg_sel == NULL) {
     518                gmultiepg_sel = ostrcat(gmultiepg_sel, "gmultiepg", 1, 0); // fallback to default
     519                debug(10, "fallback to default, set gmultiepg=%s", gmultiepg_sel);
     520        }
     521
     522        struct skin* gmultiepg = getscreen(gmultiepg_sel);
     523        debug(10, "final gmultiepg=%s", gmultiepg_sel);
     524
     525//      struct skin* gmultiepg = getscreen("gmultiepg");
    514526        struct skin* listbox = getscreennode(gmultiepg, "listbox");
    515527        struct skin* channellistbox = getscreennode(gmultiepg, "channellistbox");
  • titan/titan/skinadjust.h

    r38715 r38791  
    5858        struct skin* infobar2_sel = getscreennode(skinadjust, "infobar2_sel");
    5959        struct skin* channellist_sel = getscreennode(skinadjust, "channellist_sel");
     60        struct skin* gmultiepg_sel = getscreennode(skinadjust, "gmultiepg_sel");
    6061
    6162        struct skin* filelist = getscreennode(skinadjust, "filelist");
     
    128129        if(checkscreen("infobar_v5") != status.skinerr)
    129130                addchoicebox(infobar_sel, "infobar_v5","v5");
     131        if(checkscreen("infobar_v6") != status.skinerr)
     132                addchoicebox(infobar_sel, "infobar_v6","v6");
     133        if(checkscreen("infobar_v7") != status.skinerr)
     134                addchoicebox(infobar_sel, "infobar_v7","v7");
     135        if(checkscreen("infobar_v8") != status.skinerr)
     136                addchoicebox(infobar_sel, "infobar_v8","v8");
     137        if(checkscreen("infobar_v9") != status.skinerr)
     138                addchoicebox(infobar_sel, "infobar_v9","v9");
    130139        setchoiceboxselection(infobar_sel, getskinconfig("infobar_selection", NULL));
    131140
     
    140149        if(checkscreen("infobar2_v5") != status.skinerr)
    141150                addchoicebox(infobar2_sel, "infobar2_v5","v5");
     151        if(checkscreen("infobar2_v6") != status.skinerr)
     152                addchoicebox(infobar2_sel, "infobar2_v6","v6");
     153        if(checkscreen("infobar2_v7") != status.skinerr)
     154                addchoicebox(infobar2_sel, "infobar2_v7","v7");
     155        if(checkscreen("infobar2_v8") != status.skinerr)
     156                addchoicebox(infobar2_sel, "infobar2_v8","v8");
     157        if(checkscreen("infobar2_v9") != status.skinerr)
     158                addchoicebox(infobar2_sel, "infobar2_v9","v9");
    142159        setchoiceboxselection(infobar2_sel, getskinconfig("infobar2_selection", NULL));
    143160
     
    152169        if(checkscreen("channellist_v5") != status.skinerr)
    153170                addchoicebox(channellist_sel, "channellist_v5","v5");
     171        if(checkscreen("channellist_v6") != status.skinerr)
     172                addchoicebox(channellist_sel, "channellist_v6","v6");
     173        if(checkscreen("channellist_v7") != status.skinerr)
     174                addchoicebox(channellist_sel, "channellist_v7","v7");
     175        if(checkscreen("channellist_v8") != status.skinerr)
     176                addchoicebox(channellist_sel, "channellist_v8","v8");
     177        if(checkscreen("channellist_v9") != status.skinerr)
     178                addchoicebox(channellist_sel, "channellist_v9","v9");
    154179        setchoiceboxselection(channellist_sel, getskinconfig("channellist_selection", NULL));
     180
     181        if(checkscreen("gmultiepg") != status.skinerr)
     182                addchoicebox(gmultiepg_sel, "gmultiepg", "v1");
     183        if(checkscreen("gmultiepg_v2") != status.skinerr)
     184                addchoicebox(gmultiepg_sel, "gmultiepg_v2","v2");
     185        if(checkscreen("gmultiepg_v3") != status.skinerr)
     186                addchoicebox(gmultiepg_sel, "gmultiepg_v3","v3");
     187        if(checkscreen("gmultiepg_v4") != status.skinerr)
     188                addchoicebox(gmultiepg_sel, "gmultiepg_v4","v4");
     189        if(checkscreen("gmultiepg_v5") != status.skinerr)
     190                addchoicebox(gmultiepg_sel, "gmultiepg_v5","v5");
     191        if(checkscreen("gmultiepg_v6") != status.skinerr)
     192                addchoicebox(gmultiepg_sel, "gmultiepg_v6","v6");
     193        if(checkscreen("gmultiepg_v7") != status.skinerr)
     194                addchoicebox(gmultiepg_sel, "gmultiepg_v7","v7");
     195        if(checkscreen("gmultiepg_v8") != status.skinerr)
     196                addchoicebox(gmultiepg_sel, "gmultiepg_v8","v8");
     197        if(checkscreen("gmultiepg_v9") != status.skinerr)
     198                addchoicebox(gmultiepg_sel, "gmultiepg_v9","v9");
     199        setchoiceboxselection(gmultiepg_sel, getskinconfig("gmultiepg_selection", NULL));
    155200
    156201        char* skinpath = NULL;
     
    9721017                        //free(oldchannellist_sel); oldchannellist_sel=NULL;
    9731018
     1019                        char* oldgmultiepg_sel = getskinconfig("gmultiepg_selection", NULL);
     1020                        addskinconfigscreencheck("gmultiepg_selection", gmultiepg_sel, "0");
     1021                        if(ostrcmp(oldgmultiepg_sel,getskinconfig("gmultiepg_selection", NULL)) != 0) reboot = 1;
     1022                        //free(oldgmultiepg_sel); oldgmultiepg_sel=NULL;
     1023
    9741024                        addconfig("skinblinkoff", blinkoff->ret);
    9751025
Note: See TracChangeset for help on using the changeset viewer.