Changeset 15579

Timestamp:

05/09/12 01:10:09 (11 years ago)

Author:

obi

Message:

fix

File:

• titan/titan/channellist.h (modified) (15 diffs)

titan/titan/channellist.h

@@ -124 +124 @@
                                         chnode->handle1 = (char*) tmpbouquet;
                                         if(mode == 0 && channelnottunable(tmpbouquet->channel) == 1)
-                                        {
-                                                if(status.channellistview == 0)
-                                                        chnode->hidden = YES;
-                                                else
-                                                        chnode->deaktivcol = deaktivcol;
-                                        }
+          {
+            if(status.channellistview == 0)
+              chnode->hidden = YES;
+            else
+                                                chnode->deaktivcol = deaktivcol;
+          }
                                                 
                                         if(status.showchanneltimeline == 1 && channeltimeline != status.skinerr)
@@ -175 +175 @@
                                         chnode->handle1 = (char*) tmpchannel;
                                         if(mode == 0 && channelnottunable(tmpchannel) == 1)
-                                        {
-                                                if(status.channellistview == 0)
-                                                        chnode->hidden = YES;
-                                                else
-                                                        chnode->deaktivcol = deaktivcol;
-                                        }
+          {
+            if(status.channellistview == 0)
+                                                  chnode->hidden = YES;
+            else
+                                                chnode->deaktivcol = deaktivcol;
+          }
                                 }
                         }
@@ -232 +232 @@
                                         chnode->handle1 = (char*) tmpchannel;
                                         if(mode == 0 && channelnottunable(tmpchannel) == 1)
-                                        {
-                                                if(status.channellistview == 0)
-                                                        chnode->hidden = YES;
-                                                else
-                                                        chnode->deaktivcol = deaktivcol;
-                                        }
+          {
+            if(status.channellistview == 0)
+                                                  chnode->hidden = YES;
+            else
+                                                chnode->deaktivcol = deaktivcol;
+          }
                                 }
                         }
@@ -319 +319 @@
                                         chnode->handle1 = (char*) tmpchannel;
                                         if(mode == 0 && channelnottunable(tmpchannel) == 1)
-                                        {
-                                                if(status.channellistview == 0)
-                                                        chnode->hidden = YES;
-                                                else
-                                                        chnode->deaktivcol = deaktivcol;
-                                        }
+          {
+            if(status.channellistview == 0)
+              chnode->hidden = YES;
+            else
+                                                chnode->deaktivcol = deaktivcol;
+          }
                                 }
                         }
@@ -447 +447 @@
 }
 
-void changechanneltitle(struct skin* channellist, int listmode, char** oldtitle)
+void changechanneltitle(struct skin* channellist, int listmode, char** oldtitle, long** oldcol)
 {
         char* tmpstr = NULL;
@@ -459 +459 @@
                 tmpstr = ostrcat(tmpstr, _("Move mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-                channellist->color = convercol(getskinconfig("mvmode", NULL));
+                channellist->color = convercol("mvmode");
         }
         else if(listmode == RMMODE)
@@ -466 +466 @@
                 tmpstr = ostrcat(tmpstr, _("Remove mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-                channellist->color = convercol(getskinconfig("rmmode", NULL));
+                channellist->color = convercol("rmmode");
         }
         else if(listmode == CPMODE)
@@ -473 +473 @@
                 tmpstr = ostrcat(tmpstr, _("Copy mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-                channellist->color = convercol(getskinconfig("cpmode", NULL));          
+                channellist->color = convercol("cpmode");               
         }
         else if(listmode == PROTECTMODE)
@@ -480 +480 @@
                 tmpstr = ostrcat(tmpstr, _("Protect mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-                channellist->color = convercol(getskinconfig("protectmode", NULL));
+                channellist->color = convercol("protectmode");
         }
         else if(listmode == EDITMODE)
@@ -487 +487 @@
                 tmpstr = ostrcat(tmpstr, _("Edit mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-                channellist->color = convercol(getskinconfig("editmode", NULL));
+                channellist->color = convercol("editmode");
         }
         else
@@ -493 +493 @@
                 changetitle(channellist, *oldtitle);
                 *oldtitle = NULL;
+                channellist->color = *oldcol;
         }
 }
@@ -519 +520 @@
         int nochanneltitle = getskinconfigint("nochanneltitle", NULL);
         int firstdraw = 0;
+        long oldcol = 0;
         
         status.channelswitch = 1;
@@ -619 +621 @@
                         listmode = screenlistedit(list, (struct channel*)listbox->select->handle);
                 if(listmode == NOMODE) goto end;
-                if(nochanneltitle == 0) changechanneltitle(channellist, listmode, &oldtitle);
+                if(nochanneltitle == 0) changechanneltitle(channellist, listmode, &oldtitle, &oldcol);
         }
         if(flag != 2)
@@ -703 +705 @@
                                 if(listmode == NOMODE && flag == 3) flag = 0;
 
-                                if(nochanneltitle == 0) changechanneltitle(channellist, listmode, &oldtitle);
+                                if(nochanneltitle == 0) changechanneltitle(channellist, listmode, &oldtitle, &oldcol);
 
                                 delmarkedscreennodes(channellist, 1);
@@ -1402 +1404 @@
                                 addscreenrc(channellist, listbox);
 
-                        if(nochanneltitle == 0) changechanneltitle(channellist, listmode, &oldtitle);
+                        if(nochanneltitle == 0) changechanneltitle(channellist, listmode, &oldtitle, &oldcol);
 
                         if(listmode == NOMODE && flag == 3) flag = 0;