Changeset 32302

Timestamp:

01/11/15 02:24:31 (8 years ago)

Author:

tobayer

Message:

[titan] add infobar selection, step 2, fix

File:

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

titan/titan/skinadjust.h

@@ -21 +21 @@
         struct skin* oled_sel = getscreennode(skinadjust, "oled_sel");
         struct skin* infobar_sel = getscreennode(skinadjust, "infobar_sel");
+        struct skin* infobar2_sel = getscreennode(skinadjust, "infobar2_sel");
         struct skin* pic1 = getscreennode(skinadjust, "pic1");
         struct skin* pic2 = getscreennode(skinadjust, "pic2");
@@ -106 +107 @@
         setchoiceboxselection(infobar_sel, getskinconfig("infobar_selection", NULL));
 
+        if(checkscreen("infobar2") != status.skinerr)
+                addchoicebox(infobar2_sel, "infobar2", "v1");
+        if(checkscreen("infobar2_v2") != status.skinerr)
+                addchoicebox(infobar2_sel, "infobar2_v2","v2");
+        if(checkscreen("infobar2_v3") != status.skinerr)
+                addchoicebox(infobar2_sel, "infobar2_v3","v3");
+        setchoiceboxselection(infobar2_sel, getskinconfig("infobar2_selection", NULL));
+
         addchoicebox(showrecfreesize, "0", _("no"));
         addchoicebox(showrecfreesize, "1", _("yes (Text in %)"));
@@ -242 +251 @@
                         addskinconfigscreencheck("infobar_selection", infobar_sel, "0");
                         if(ostrcmp(oldinfobar_sel,getskinconfig("infobar_selection", NULL)) != 0) reboot = 1;
-                        if(ostrcmp(getskinconfig("infobar_selection", NULL), "infobar") != 0)
-                                addskinconfigscreencheck("infobar2_selection", "infobar2", "0");
-                        if(ostrcmp(getskinconfig("infobar_selection", NULL), "infobar_v2") != 0)
-                                addskinconfigscreencheck("infobar2_selection", "infobar2_v2", "0");
-                        if(ostrcmp(getskinconfig("infobar_selection", NULL), "infobar_v3") != 0)
-                                addskinconfigscreencheck("infobar2_selection", "infobar2_v3", "0");
+
+                        char* oldinfobar2_sel = getskinconfig("infobar2_selection", NULL);
+                        addskinconfigscreencheck("infobar2_selection", infobar2_sel, "0");
+                        if(ostrcmp(oldinfobar2_sel,getskinconfig("infobar2_selection", NULL)) != 0) reboot = 1;
 
                         writeskinconfigtmp();