Changeset 29930

Timestamp:

09/11/14 19:45:27 (10 years ago)

Author:

gost

Message:

[titan] nemesis add oled selection

Location:

titan/titan

Files:

• oled.h (modified) (1 diff)
• skinadjust.h (modified) (3 diffs)

titan/titan/oled.h

@@ -37 +37 @@
                 OLED_nemesis = getscreen("OLED_nemesis_standby");
         else
-                OLED_nemesis = getscreen("OLED_nemesis");
+        {
+                
+                OLED_nemesis = getscreen(getskinconfig("OLED_nemesis", NULL));
+                if(OLED_nemesis == NULL)
+                        OLED_nemesis = getscreen("OLED_nemesis");
+        }
         
         struct skin* textbox = getscreennode(OLED_nemesis, "textbox");

titan/titan/skinadjust.h

@@ -16 +16 @@
         struct skin* showrecfreesize = getscreennode(skinadjust, "showrecfreesize");
         struct skin* listboxselect = getscreennode(skinadjust, "listboxselect");
+        struct skin* oled_sel = getscreennode(skinadjust, "oled_sel");
         struct skin* pic1 = getscreennode(skinadjust, "pic1");
         struct skin* pic2 = getscreennode(skinadjust, "pic2");
@@ -72 +73 @@
                 pic2->hidden = YES;
         }
+        if(checkbox("ATEMIO-NEMESIS"))
+        {
+                addchoicebox(oled_sel, "OLED_nemesis", "v1");
+                addchoicebox(oled_sel, "OLED_nemesis_v2","v2");
+                addchoicebox(oled_sel, "OLED_nemesis_v3","v3");
+                addchoicebox(oled_sel, "OLED_nemesis_v4","v4");
+                setchoiceboxselection(listboxselecttype, getskinconfig("OLED_nemesis", NULL));
+        }
+        else
+                oled_sel->hidden = YES;
 
         addchoicebox(showrecfreesize, "0", _("no"));
@@ -157 +168 @@
                         status.showrecfreesize = getconfigint("showrecfreesize", NULL);
 
+                        if(checkbox("ATEMIO-NEMESIS"))
+                                addskinconfigscreencheck("OLED_nemesis", oled_sel, "0");
+                        
                         writeskinconfigtmp();
                         if(reboot == 1)