Changeset 15328

Timestamp:

04/19/12 21:39:58 (11 years ago)

Author:

nit

Message:

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

File:

• titan/titan/gmultiepg.h (modified) (28 diffs)

titan/titan/gmultiepg.h

@@ -110 +110 @@
 }
 
-
-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)
+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, int marklast)
 {
         int treffer = 0, gridbr = 0, aktcol = 0, nottuneable = 0;
@@ -160 +159 @@
                                         if(gridbr == 0)
                                         {
+                                                chnode1->titlesize = 1;
                                                 chnode1->type = TEXTBOX | GRIDBR;
                                                 if(tmpchannel == aktchannel)
@@ -204 +204 @@
                                         if(chnode1->posx + chnode1->width >= listbox->iwidth)
                                         {
+                                                if(marklast == 1 && tmpchannel == aktchannel)
+                                                        listbox->aktline = *aktline;
+                                                chnode1->titlesize += 2;
                                                 chnode1->width = listbox->iwidth - chnode1->posx;
                                                 break;
@@ -210 +213 @@
                                 epgnode = epgnode->next;
                         }
+                        
+                        if(chnode1 != NULL && chnode1->titlesize < 2) chnode1->titlesize += 2;
+                        
                         if(gridbr == 0)
                         {
@@ -216 +222 @@
                                 if(chnode1 != NULL)
                                 {
+                                        chnode1->titlesize = 3;
                                         (*aktline)++;
                                         if(tmpchannel == aktchannel)
@@ -240 +247 @@
 }
 
-int showallgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int zoom, time_t akttime, struct channel* aktchannel)
+int showallgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int zoom, time_t akttime, struct channel* aktchannel, int marklast)
 {
         int treffer = 0, aktline = 0;
@@ -262 +269 @@
         while(tmpchannel != NULL)
         { 
-                if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
+                if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
                         treffer = 1;
                 tmpchannel = tmpchannel->next;
@@ -269 +276 @@
 }
 
-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)
+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, int marklast)
 {
         int treffer = 0, aktline = 0;
@@ -291 +298 @@
         while(tmpbouquet != NULL)
         {
-                if(calcgmultiepg(tmpbouquet->channel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
+                if(calcgmultiepg(tmpbouquet->channel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
                         treffer = 1;
                 tmpbouquet = tmpbouquet->next;
@@ -298 +305 @@
 }
 
-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)
+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, int marklast)
 {
         int treffer = 0, aktline = 0;
@@ -321 +328 @@
                 if(tmpchannel->provider == providernode)
                 {
-                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
+                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
                                 treffer = 1;
                 }
@@ -329 +336 @@
 }
 
-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)
+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, int marklast)
 {
         int treffer = 0, aktline = 0;
@@ -354 +361 @@
                 if(tmpchannel->transponder != NULL && tmpchannel->transponder->orbitalpos == satnode->orbitalpos)
                 {
-                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
+                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
                                 treffer = 1;
                 }
@@ -362 +369 @@
 }
 
-int showazgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct skin* timeline, int character, int zoom, time_t akttime, struct channel* aktchannel)
+int 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)
 {
         int treffer = 0, aktline = 0;
@@ -385 +392 @@
                 if(tmpchannel->name != NULL && (tmpchannel->name[0] == character || tmpchannel->name[0] == character + 32))
                 {
-                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol) == 1)
+                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, linecol1, linecol2, linecol3, &aktline, &chnode, &chnode1, height, picheight, epgpicon, deaktivcol, marklast) == 1)
                                 treffer = 1;
                 }
@@ -523 +530 @@
                         list = BOUQUETCHANNEL;
                         aktlist = (void*)mainbouquetnode;
-                        showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, mainbouquetnode->bouquet, zoom, akttime, aktchannel);
+                        showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, mainbouquetnode->bouquet, zoom, akttime, aktchannel, 0);
                         selectchannelgmepg(channellistbox);
                 }
@@ -537 +544 @@
                 character = (int)tmpstr[6];
                 aktlist = (void*)(int)tmpstr[6];
-                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel);
+                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel, 0);
                 selectchannelgmepg(channellistbox);
         }
@@ -550 +557 @@
                 list = SATCHANNEL;
                 aktlist = (void*)satnode;
-                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel);
+                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel, 0);
                 selectchannelgmepg(channellistbox);
         }
@@ -563 +570 @@
                 list = PROVIDERCHANNEL;
                 aktlist = (void*)providernode;
-                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel);
+                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel, 0);
                 selectchannelgmepg(channellistbox);
         }
@@ -570 +577 @@
                 if(nochanneltitle == 0) changetitle(gmultiepg, _("GRAPHIC MULTI EPG - All Channels"));
                 list = ALLCHANNEL;
-                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel);
+                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, 0);
                 selectchannelgmepg(channellistbox);
         }
@@ -656 +663 @@
                 }
 
-                if(rcret == getrcconfigint("rcff", NULL) || rcret == getrcconfigint("rcfav", NULL))
+                if((listbox->select != NULL && (listbox->select->titlesize == 1 || listbox->select->titlesize == 3) && rcret == getrcconfigint("rcright", NULL)) || rcret == getrcconfigint("rcff", NULL) || rcret == getrcconfigint("rcfav", NULL))
                 {
                         time_t tmptime = 0;
@@ -673 +680 @@
                         if(list == BOUQUETCHANNEL)
                         {
-                                if(showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel) == 0)
+                                if(showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel, 0) == 0)
                                 {
                                         if(tmptime == 0)
@@ -682 +689 @@
                                                 akttime = starttime;
                                         else
-                                                showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel);
+                                                showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel, 0);
                                 }
                         }
                         else if(list == ALLCHANNEL)
                         {
-                                if(showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel) == 0)
+                                if(showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, 0) == 0)
                                 {
                                         if(tmptime == 0)
@@ -696 +703 @@
                                                 akttime = starttime;
                                         else
-                                                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel);
+                                                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, 0);
                                 }
                         }
                         else if(list == AZCHANNEL)
                         {
-                                if(showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel) == 0)
+                                if(showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel, 0) == 0)
                                 {
                                         if(tmptime == 0)
@@ -710 +717 @@
                                                 akttime = starttime;
                                         else
-                                                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel);
+                                                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel, 0);
                                 }
                         }
                         else if(list == SATCHANNEL)
                         {
-                                if(showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel) == 0)
+                                if(showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel, 0) == 0)
                                 {
                                         if(tmptime == 0)
@@ -724 +731 @@
                                                 akttime = starttime;
                                         else
-                                                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel);
+                                                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel, 0);
                                 }
                         }
                         else if(list == PROVIDERCHANNEL)
                         {
-                                if(showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel) == 0)
+                                if(showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel, 0) == 0)
                                 {
                                         if(tmptime == 0)
@@ -738 +745 @@
                                                 akttime = starttime;
                                         else
-                                                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel);
+                                                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel, 0);
                                 }
                         }
@@ -752 +759 @@
                 }
 
-                if(rcret == getrcconfigint("rcfr", NULL))
+                if((listbox->select != NULL && (listbox->select->titlesize == 2 || listbox->select->titlesize == 3) && rcret == getrcconfigint("rcleft", NULL)) || rcret == getrcconfigint("rcfr", NULL))
                 {
                         akttime -= addtime;
                         if(akttime < starttime) akttime = starttime;
+                        
+                        int marklast = 0;
+                        if(rcret == getrcconfigint("rcleft", NULL)) marklast = 1;
 
                         if(list == BOUQUETCHANNEL)
-                                showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel);
+                                showbouquetgmepgchannel(gmultiepg, channellistbox, listbox, timeline, ((struct mainbouquet*)aktlist)->bouquet, zoom, akttime, aktchannel, marklast);
                         else if(list == ALLCHANNEL)
-                                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel);
+                                showallgmepgchannel(gmultiepg, channellistbox, listbox, timeline, zoom, akttime, aktchannel, marklast);
                         else if(list == AZCHANNEL)
-                                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel);
+                                showazgmepgchannel(gmultiepg, channellistbox, listbox, timeline, character, zoom, akttime, aktchannel, marklast);
                         else if(list == SATCHANNEL)
-                                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel);
+                                showsatgmepgchannel(gmultiepg, channellistbox, listbox, timeline, satnode, zoom, akttime, aktchannel, marklast);
                         else if(list == PROVIDERCHANNEL)
-                                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel);
+                                showprovidergmepgchannel(gmultiepg, channellistbox, listbox, timeline, providernode, zoom, akttime, aktchannel, marklast);
                         createtimeline(gmultiepg, timeline, akttime, zoom);
                         status.screencalc = 2;