Changeset 32298

Timestamp:

01/11/15 01:40:50 (8 years ago)

Author:

tobayer

Message:

[titan] add infobar selection, step 1

File:

• titan/titan/skinadjust.h (modified) (13 diffs)

titan/titan/skinadjust.h

@@ -18 +18 @@
         struct skin* tithek_selectcol = getscreennode(skinadjust, "tithek_selectcol");
         struct skin* filelistselect = getscreennode(skinadjust, "filelistselect");
-        
+
         struct skin* oled_sel = getscreennode(skinadjust, "oled_sel");
+        struct skin* infobar_sel = getscreennode(skinadjust, "infobar_sel");
         struct skin* pic1 = getscreennode(skinadjust, "pic1");
         struct skin* pic2 = getscreennode(skinadjust, "pic2");
-        
+
         struct skin* tmp = NULL;
 
@@ -33 +34 @@
         addchoicebox(listboxselecttype, "3", _("picture"));
         setchoiceboxselection(listboxselecttype, getskinconfig("listboxselecttype", NULL));
-        
+
         changeinput(osdtransparent, "0\n5\n10\n15\n20\n25\n30\n35\n40\n45\n50\n55\n60\n65\n70");
         setchoiceboxselection(osdtransparent, getskinconfig("osdtransparent", NULL));
@@ -91 +92 @@
                 if(checkscreen("OLED_nemesis_v6") != status.skinerr)
                         addchoicebox(oled_sel, "OLED_nemesis_v6","v6");
-                
+
                 setchoiceboxselection(oled_sel, getskinconfig("OLED_nemesis", NULL));
         }
@@ -97 +98 @@
                 oled_sel->hidden = YES;
 
+        if(checkscreen("infobar") != status.skinerr)
+                addchoicebox(infobar_sel, "infobar", "v1");
+        if(checkscreen("infobar_v2") != status.skinerr)
+                addchoicebox(infobar_sel, "infobar_v2","v2");
+        if(checkscreen("infobar_v3") != status.skinerr)
+                addchoicebox(infobar_sel, "infobar_v3","v3");
+        setchoiceboxselection(infobar_sel, getskinconfig("infobarselection", NULL));
+
         addchoicebox(showrecfreesize, "0", _("no"));
         addchoicebox(showrecfreesize, "1", _("yes (Text in %)"));
         addchoicebox(showrecfreesize, "2", _("yes (Text in MB)"));
         setchoiceboxselection(showrecfreesize, getconfig("showrecfreesize", NULL));
-        
+
         addchoicebox(listboxselect, "0", _("press red"));
         addchoicebox(tithek_selectcol, "1", _("press green"));
@@ -120 +129 @@
                 if(status.leftoffset != getconfigint("fbleftoffset", NULL)) offsetchange = 1; 
                 status.leftoffset = getconfigint("fbleftoffset", NULL);
-                
+
                 addconfigscreencheck("fbrightoffset", rightoffset, "0");
                 if(status.rightoffset != getconfigint("fbrightoffset", NULL)) offsetchange = 1;
                 status.rightoffset = getconfigint("fbrightoffset", NULL);
-                
+
                 addconfigscreencheck("fbtopoffset", topoffset, "0");
                 if(status.topoffset != getconfigint("fbtopoffset", NULL)) offsetchange = 1;
                 status.topoffset = getconfigint("fbtopoffset", NULL);
-                
+
                 addconfigscreencheck("fbbottomoffset", bottomoffset, "0");
                 if(status.bottomoffset != getconfigint("fbbottomoffset", NULL)) offsetchange = 1;
                 status.bottomoffset = getconfigint("fbbottomoffset", NULL);
-                        
+
                 if(offsetchange == 1 && (ostrcmp(getconfig("av_mode3d", NULL), "sbs") == 0 || ostrcmp(getconfig("av_mode3d", NULL), "tab") == 0)) clearfball();
 
@@ -140 +149 @@
                 setfbosd();
 #endif
-                
+
                 if((rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL)) && checkbox("ATEMIO-NEMESIS") == 1 && listbox->select != NULL && ostrcmp(listbox->select->name, "oled_sel") == 0)
                 {
@@ -153 +162 @@
                         free(tmpstr);tmpstr=NULL;
                 }
-                
+
                 if(rcret == getrcconfigint("rcexit", NULL))
                 {
@@ -179 +188 @@
                                 drawscreen(skinadjust, 0, 0);
                         }
-                        
-                        continue;               
+
+                        continue;
                 }
 
@@ -194 +203 @@
                                 drawscreen(skinadjust, 0, 0);
                         }
-                        
-                        continue;               
+
+                        continue;
                 }
 
@@ -209 +218 @@
                                 drawscreen(skinadjust, 0, 0);
                         }
-                        
-                        continue;               
+
+                        continue;
                 }
 
@@ -218 +227 @@
                         addskinconfigscreencheck("fontsizeadjust", fontsizeadjust, "0");
                         if(oldfontsizeadjust != getskinconfigint("fontsizeadjust", NULL)) reboot = 1;
-                        status.fontsizeadjust = getskinconfigint("fontsizeadjust", NULL);                       
-                        
+                        status.fontsizeadjust = getskinconfigint("fontsizeadjust", NULL);
+
                         addskinconfigscreencheck("listboxselecttype", listboxselecttype, "0");
                         status.listboxselecttype = getskinconfigint("listboxselecttype", NULL);
@@ -229 +238 @@
                         if(checkbox("ATEMIO-NEMESIS"))
                                 addskinconfigscreencheck("OLED_nemesis", oled_sel, "0");
-                        
+
+                        char* oldinfobar_sel = getskinconfig("infobarselection", NULL);
+                        addskinconfigscreencheck("infobarselection", infobar_sel, "0");
+                        if(ostrcmp(oldinfobar_sel,getskinconfig("infobarselection", NULL)) != 0) reboot = 1;
+                        status.infobar_sel = getskinconfig("infobarselection", NULL);
+
                         writeskinconfigtmp();
                         if(reboot == 1)
@@ -236 +250 @@
                                 oshutdown(3, 0);
                         }
-      
+
                         break;
                 }