Changeset 24325 for titan

Timestamp:

10/15/13 13:01:25 (10 years ago)

Author:

obi

Message:

[tithek] fix internet radio screensaver and optimize site textbox tpk

Location:

titan

Files:

• plugins/tithek/tithek.h (modified) (2 diffs)
• titan/extensions.h (modified) (4 diffs)

titan/plugins/tithek/tithek.h

@@ -1180 +1180 @@
                 free(tmpstr); tmpstr = NULL;
 
-                if(ostrcmp(title, "TiThek - Internet Radio") == 0)
+                if(ostrstr(title, "Internet Radio") != NULL)
                         flag = 4;
 
@@ -1237 +1237 @@
                         mbox = menulistbox(mlist, NULL, skintitle, NULL, NULL, 1, 0);
                         if(mbox != NULL) keyconf = mbox->name;
+                        debug(99, "tmpstr1: %s filename: %s flag: %s", tmpstr1, filename, flag);
                         if(ostrcmp(keyconf, "Streaming Playback (default)") == 0)
                         {

titan/titan/extensions.h

@@ -218 +218 @@
                                         tmpinfo = ostrcat(tmpinfo, " ?", 1, 0);
                 
-                                        if(textbox(_("Tpk Install Info"), _(tmpinfo), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 800, 200, 0, 0) == 1)
+                                        if(textbox(_("Tpk Install Info"), _(tmpinfo), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
                                         {
                                                 drawscreen(load, 0, 0);
@@ -292 +292 @@
                                 if(file_exist("/tmp/.tpk_needs_reboot"))
                                 {
-                                        textbox(_("Message"), _("TPK Remove done, your system will reboot !"), "EXIT", getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
+                                        textbox(_("Message"), _("TPK Remove done, your system will reboot !"), "EXIT", getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 800, 200, 0, 0);
                                         system("init 6");
                                 }
@@ -345 +345 @@
                                 tmpinfo = ostrcat(tmpinfo, " ?", 1, 0);
         
-                                if(textbox(_(text2), _(tmpinfo), "EXIT", getrcconfigint("rcexit", NULL), "OK", getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, 800, 200, 0, 0) == 2)
+                                if(textbox(_(text2), _(tmpinfo), "EXIT", getrcconfigint("rcexit", NULL), "OK", getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 2)
                                 {
                                         char* log = NULL;
@@ -370 +370 @@
                                         if(ret != 0) log = gettpklog(installpath, 1);
                                         if(ret == 0) log = gettpklog(installpath, 0);
-                                        textbox(_(text2), log, "EXIT", getrcconfigint("rcexit", NULL), "OK", getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, 800, 600, 0, 0);
+                                        textbox(_(text2), log, "EXIT", getrcconfigint("rcexit", NULL), "OK", getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, 1000, 600, 0, 0);
                                         free(log); log = NULL;
                                         unlink(TPKLOG);
-                                        textbox(_("Message"), _("Some plugins needs restart.\nIf the plugin is not active\nreboot the box."), "EXIT", getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
+                                        textbox(_("Message"), _("Some plugins needs restart.\nIf the plugin is not active\nreboot the box."), "EXIT", getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 1000, 200, 0, 0);
                                         loadplugin();
                                         if(file_exist("/tmp/.tpk_needs_reboot"))