Changeset 15328


Ignore:
Timestamp:
04/19/12 21:39:58 (10 years ago)
Author:
nit
Message:

[titan] add < > to g-multiepg for change page left / right

File:
1 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/gmultiepg.h

    r15257 r15328  
    110110}
    111111
    112 
    113 int calcgmultiepg(struct channel* tmpchannel, struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int zoom, time_t akttime, struct channel* aktchannel, int linecol1, int linecol2, int linecol3, int* aktline, struct skin** pchnode, struct skin** pchnode1, int height, int picheight, int epgpicon, long deaktivcol)
     112int calcgmultiepg(struct channel* tmpchannel, struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int zoom, time_t akttime, struct channel* aktchannel, int linecol1, int linecol2, int linecol3, int* aktline, struct skin** pchnode, struct skin** pchnode1, int height, int picheight, int epgpicon, long deaktivcol, int marklast)
    114113{
    115114        int treffer = 0, gridbr = 0, aktcol = 0, nottuneable = 0;
     
    160159                                        if(gridbr == 0)
    161160                                        {
     161                                                chnode1->titlesize = 1;
    162162                                                chnode1->type = TEXTBOX | GRIDBR;
    163163                                                if(tmpchannel == aktchannel)
     
    204204                                        if(chnode1->posx + chnode1->width >= listbox->iwidth)
    205205                                        {
     206                                                if(marklast == 1 && tmpchannel == aktchannel)
     207                                                        listbox->aktline = *aktline;
     208                                                chnode1->titlesize += 2;
    206209                                                chnode1->width = listbox->iwidth - chnode1->posx;
    207210                                                break;
     
    210213                                epgnode = epgnode->next;
    211214                        }
     215                       
     216                        if(chnode1 != NULL && chnode1->titlesize < 2) chnode1->titlesize += 2;
     217                       
    212218                        if(gridbr == 0)
    213219                        {
     
    216222                                if(chnode1 != NULL)
    217223                                {
     224                                        chnode1->titlesize = 3;
    218225                                        (*aktline)++;
    219226                                        if(tmpchannel == aktchannel)
     
    240247}
    241248
    242 int showallgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int zoom, time_t akttime, struct channel* aktchannel)
     249int showallgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int zoom, time_t akttime, struct channel* aktchannel, int marklast)
    243250{
    244251        int treffer = 0, aktline = 0;
     
    262269        while(tmpchannel != NULL)
    263270        {
    264                 if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
     271                if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
    265272                        treffer = 1;
    266273                tmpchannel = tmpchannel->next;
     
    269276}
    270277
    271 int showbouquetgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, struct bouquet* firstbouquet, int zoom, time_t akttime, struct channel* aktchannel)
     278int showbouquetgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, struct bouquet* firstbouquet, int zoom, time_t akttime, struct channel* aktchannel, int marklast)
    272279{
    273280        int treffer = 0, aktline = 0;
     
    291298        while(tmpbouquet != NULL)
    292299        {
    293                 if(calcgmultiepg(tmpbouquet->channel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
     300                if(calcgmultiepg(tmpbouquet->channel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
    294301                        treffer = 1;
    295302                tmpbouquet = tmpbouquet->next;
     
    298305}
    299306
    300 int showprovidergmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, struct provider* providernode, int zoom, time_t akttime, struct channel* aktchannel)
     307int showprovidergmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, struct provider* providernode, int zoom, time_t akttime, struct channel* aktchannel, int marklast)
    301308{
    302309        int treffer = 0, aktline = 0;
     
    321328                if(tmpchannel->provider == providernode)
    322329                {
    323                         if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
     330                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
    324331                                treffer = 1;
    325332                }
     
    329336}
    330337
    331 int showsatgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, struct sat* satnode, int zoom, time_t akttime, struct channel* aktchannel)
     338int showsatgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, struct sat* satnode, int zoom, time_t akttime, struct channel* aktchannel, int marklast)
    332339{
    333340        int treffer = 0, aktline = 0;
     
    354361                if(tmpchannel->transponder != NULL && tmpchannel->transponder->orbitalpos == satnode->orbitalpos)
    355362                {
    356                         if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
     363                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
    357364                                treffer = 1;
    358365                }
     
    362369}
    363370
    364 int showazgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int character, int zoom, time_t akttime, struct channel* aktchannel)
     371int showazgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int character, int zoom, time_t akttime, struct channel* aktchannel, int marklast)
    365372{
    366373        int treffer = 0, aktline = 0;
     
    385392                if(tmpchannel->name != NULL && (tmpchannel->name[0] == character || tmpchannel->name[0] == character + 32))
    386393                {
    387                         if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
     394                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
    388395                                treffer = 1;
    389396                }
     
    523530                        list = BOUQUETCHANNEL;
    524531                        aktlist = (void*)mainbouquetnode;
    525                         showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, mainbouquetnode->bouquet, zoom, akttime, aktchannel);
     532                        showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, mainbouquetnode->bouquet, zoom, akttime, aktchannel, 0);
    526533                        selectchannelgmepg(channellistbox);
    527534                }
     
    537544                character = (int)tmpstr[6];
    538545                aktlist = (void*)(int)tmpstr[6];
    539                 showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel);
     546                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel, 0);
    540547                selectchannelgmepg(channellistbox);
    541548        }
     
    550557                list = SATCHANNEL;
    551558                aktlist = (void*)satnode;
    552                 showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel);
     559                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel, 0);
    553560                selectchannelgmepg(channellistbox);
    554561        }
     
    563570                list = PROVIDERCHANNEL;
    564571                aktlist = (void*)providernode;
    565                 showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel);
     572                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel, 0);
    566573                selectchannelgmepg(channellistbox);
    567574        }
     
    570577                if(nochanneltitle == 0) changetitle(gmultiepg, _("GRAPHIC MULTI EPG - All Channels"));
    571578                list = ALLCHANNEL;
    572                 showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel);
     579                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, 0);
    573580                selectchannelgmepg(channellistbox);
    574581        }
     
    656663                }
    657664
    658                 if(rcret == getrcconfigint("rcff", NULL) || rcret == getrcconfigint("rcfav", NULL))
     665                if((listbox->select != NULL && (listbox->select->titlesize == 1 || listbox->select->titlesize == 3) && rcret == getrcconfigint("rcright", NULL)) || rcret == getrcconfigint("rcff", NULL) || rcret == getrcconfigint("rcfav", NULL))
    659666                {
    660667                        time_t tmptime = 0;
     
    673680                        if(list == BOUQUETCHANNEL)
    674681                        {
    675                                 if(showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel) == 0)
     682                                if(showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel, 0) == 0)
    676683                                {
    677684                                        if(tmptime == 0)
     
    682689                                                akttime = starttime;
    683690                                        else
    684                                                 showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel);
     691                                                showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel, 0);
    685692                                }
    686693                        }
    687694                        else if(list == ALLCHANNEL)
    688695                        {
    689                                 if(showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel) == 0)
     696                                if(showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, 0) == 0)
    690697                                {
    691698                                        if(tmptime == 0)
     
    696703                                                akttime = starttime;
    697704                                        else
    698                                                 showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel);
     705                                                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, 0);
    699706                                }
    700707                        }
    701708                        else if(list == AZCHANNEL)
    702709                        {
    703                                 if(showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel) == 0)
     710                                if(showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel, 0) == 0)
    704711                                {
    705712                                        if(tmptime == 0)
     
    710717                                                akttime = starttime;
    711718                                        else
    712                                                 showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel);
     719                                                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel, 0);
    713720                                }
    714721                        }
    715722                        else if(list == SATCHANNEL)
    716723                        {
    717                                 if(showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel) == 0)
     724                                if(showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel, 0) == 0)
    718725                                {
    719726                                        if(tmptime == 0)
     
    724731                                                akttime = starttime;
    725732                                        else
    726                                                 showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel);
     733                                                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel, 0);
    727734                                }
    728735                        }
    729736                        else if(list == PROVIDERCHANNEL)
    730737                        {
    731                                 if(showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel) == 0)
     738                                if(showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel, 0) == 0)
    732739                                {
    733740                                        if(tmptime == 0)
     
    738745                                                akttime = starttime;
    739746                                        else
    740                                                 showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel);
     747                                                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel, 0);
    741748                                }
    742749                        }
     
    752759                }
    753760
    754                 if(rcret == getrcconfigint("rcfr", NULL))
     761                if((listbox->select != NULL && (listbox->select->titlesize == 2 || listbox->select->titlesize == 3) && rcret == getrcconfigint("rcleft", NULL)) || rcret == getrcconfigint("rcfr", NULL))
    755762                {
    756763                        akttime -= addtime;
    757764                        if(akttime < starttime) akttime = starttime;
     765                       
     766                        int marklast = 0;
     767                        if(rcret == getrcconfigint("rcleft", NULL)) marklast = 1;
    758768
    759769                        if(list == BOUQUETCHANNEL)
    760                                 showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel);
     770                                showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel, marklast);
    761771                        else if(list == ALLCHANNEL)
    762                                 showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel);
     772                                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, marklast);
    763773                        else if(list == AZCHANNEL)
    764                                 showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel);
     774                                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel, marklast);
    765775                        else if(list == SATCHANNEL)
    766                                 showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel);
     776                                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel, marklast);
    767777                        else if(list == PROVIDERCHANNEL)
    768                                 showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel);
     778                                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel, marklast);
    769779                        createtimeline(gmultiepg, timeline, akttime, zoom);
    770780                        status.screencalc = 2;
Note: See TracChangeset for help on using the changeset viewer.