Changeset 18779

Timestamp:

11/26/12 02:35:57 (11 years ago)

Author:

obi

Message:

rename plugin for public

Location:

titan

Files:

• plugins/makesh4.sh (modified) (1 diff)
• plugins/plugin_skin_ID.txt (modified) (1 diff)
• plugins/readerconfig (moved) (moved from titan/plugins/oscam)
• plugins/readerconfig/oscam.c (deleted)
• plugins/readerconfig/oscam.h (deleted)
• plugins/readerconfig/readerconfig.c (copied) (copied from titan/plugins/oscam/oscam.c) (3 diffs)
• plugins/readerconfig/readerconfig.h (copied) (copied from titan/plugins/oscam/oscam.h) (3 diffs)
• skins/readerconfig (moved) (moved from titan/skins/oscam)
• skins/readerconfig/skin.xml (copied) (copied from titan/skins/oscam/skin.xml) (2 diffs)
• titan/softcam.h (modified) (2 diffs)

titan/plugins/makesh4.sh

@@ -113 +113 @@
 compile "catcatch" "catcatch" "" ""
 compile "facebook" "facebook" "" "-l curl"
-compile "oscam" "oscam" "" ""
+compile "readerconfig" "readerconfig" "" ""
 
 #rm -r networkbrowser/networkbrowser

titan/plugins/plugin_skin_ID.txt

@@ -24 +24 @@
 catcatch: 241
 facebook: 242
-oscam: 243
+readerconfig: 243
 TopfieldVFD: ---
 browser: ---

titan/plugins/readerconfig/readerconfig.c

@@ -4 +4 @@
 #include "oscam.h"
 
-char pluginname[] = "Oscam Config";
-char plugindesc[] = "Oscam Config";
+char pluginname[] = "Reader Config";
+char plugindesc[] = "Reader Config";
 char pluginpic[] = "%pluginpath%/oscam/plugin.png";
 
@@ -16 +16 @@
         char* tmpstr = NULL;
 
-        tmpstr = ostrcat(getconfig("pluginpath", NULL), "/oscam/skin.xml", 0, 0);
+        tmpstr = ostrcat(getconfig("pluginpath", NULL), "/readerconfig/skin.xml", 0, 0);
         readscreen(tmpstr, 243, 1);
         free(tmpstr); tmpstr = NULL;
 
         pluginaktiv = 1;
-        debug(10, "Oscam Config Plugin loadet !!!");
+        debug(10, "Reader Config Plugin loadet !!!");
 }
 
@@ -29 +29 @@
         delmarkedscreen(243);
         pluginaktiv = 0;
-        debug(10, "Oscam Config Plugin removed !!!");
+        debug(10, "Reader Config Plugin removed !!!");
 }
 

titan/plugins/readerconfig/readerconfig.h

@@ -1 @@
-#ifndef OSCAM_H
-#define OSCAM_H
+#ifndef READERCONFIG_H
+#define READERCONFIG_H
 
 struct oscam
@@ -240 +240 @@
 {
         int rcret = -1;
-        struct skin* oscamconfig = getscreen("oscamconfig");
+        struct skin* oscamconfig = getscreen("readerconfig");
         struct skin* listbox = getscreennode(oscamconfig, "listbox");
         struct skin* enable = getscreennode(oscamconfig, "enable");
@@ -296 +296 @@
 {
         int rcret = -1;
-        struct skin* skinoscam = getscreen("oscam");
+        struct skin* skinoscam = getscreen("reader");
         struct skin* listbox = getscreennode(skinoscam, "listbox");
         struct skin* tmp = NULL;

titan/skins/readerconfig/skin.xml

@@ -1 @@
-#oscam fullscreen, max 1220x660, Xspace=30 !
-<screen name="oscam" fontcol="fontcol" bgcol="black" posx="left" posy="top" width="100%" height="100%" hspace="30" vspace="30">
-<node name="titletext" text="Oscam Config" fontcol="black" fontsize="36" posx="0" posy="0" width="840" height="50" valign="middle" halign="center" bordercol="black" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
+#reader fullscreen, max 1220x660, Xspace=30 !
+<screen name="reader" fontcol="fontcol" bgcol="black" posx="left" posy="top" width="100%" height="100%" hspace="30" vspace="30">
+<node name="titletext" text="Reader Config" fontcol="black" fontsize="36" posx="0" posy="0" width="840" height="50" valign="middle" halign="center" bordercol="black" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
         <node name="minitv" func="gettvpic" param1="494:25:210">
         <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" bgcol="0" transparent="255">
@@ -14 +14 @@
 </screen>
 
-#oscamconfig fullscreen, max 1220x660, Xspace=30 !
-<screen name="oscamconfig" fontcol="fontcol" bgcol="black" posx="left" posy="top" width="100%" height="100%" hspace="30" vspace="30">
-<node name="titletext" text="Softcam Panel" fontcol="black" fontsize="36" posx="0" posy="0" width="840" height="50" valign="middle" halign="center" bordercol="black" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
+#readerconfig fullscreen, max 1220x660, Xspace=30 !
+<screen name="readerconfig" fontcol="fontcol" bgcol="black" posx="left" posy="top" width="100%" height="100%" hspace="30" vspace="30">
+<node name="titletext" text="Reader Config" fontcol="black" fontsize="36" posx="0" posy="0" width="840" height="50" valign="middle" halign="center" bordercol="black" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
         <node name="minitv" func="gettvpic" param1="494:25:210">
         <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" bgcol="0" transparent="255">
         <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" transparent="0">
 <node name="details" bordercol="titlebgcol" bordersize="1" borderradius="8" type="textbox" wrap="yes" fontsize="28" posx="0" posy="60" width="840" height="145" hspace="10" vspace="10" text="Here you can set your language. Use to navigate the control cross and the extra buttons displayed with your remote control to select.">
-<node name="menutitle" text="Softcam Selection" fontcol="black" fontsize="28" posx="110" posy="285" width="1000" height="30" hspace="10" valign="middle" bordercol="black" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
+<node name="menutitle" text="Reader Configuration" fontcol="black" fontsize="28" posx="110" posy="285" width="1000" height="30" hspace="10" valign="middle" bordercol="black" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
 <node name="listbox" type="listbox" scrollbar="auto" bordercol="titlebgcol" bordersize="1" fontsize="28" posx="center" posy="325" width="1000" height="275" hspace="5" vspace="5">
 <node name=enable type=choicebox parent=listbox valign=middle posx=0 text="Enable" bordercol=bordercol width=100%>

titan/titan/softcam.h

@@ -388 +388 @@
                         }
                         
-                        pluginnode = getplugin("Oscam Config");
+                        pluginnode = getplugin("Reader Config");
 
                         if(pluginnode != NULL)
@@ -397 +397 @@
                         }
                         else
-                                textbox(_("Message"), _("Oscam Config Plugin not installed !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 10, 0);
+                                textbox(_("Message"), _("Reader Config Plugin not installed !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 10, 0);
                         drawscreen(softcam, 0, 0);
                         free(tmpstr), tmpstr = NULL;