Changeset 11419

Timestamp:

Nov 20, 2011, 4:49:55 PM (9 years ago)

Author:

nit

Message:

[titan] del AAF text

Location:

titan/plugins/panel

Files:

• panel.c (modified) (2 diffs)
• panel_extensions.h (modified) (5 diffs)
• panel_global.h (modified) (1 diff)
• panel_header.h (modified) (1 diff)
• panel_infos.h (modified) (9 diffs)
• panel_infos_sysinfo.h (modified) (9 diffs)
• panel_ipk.h (modified) (5 diffs)
• panel_main.h (modified) (10 diffs)
• panel_settings.h (modified) (7 diffs)
• panel_settings_autostart.h (modified) (43 diffs)
• panel_settings_bluebutton.h (modified) (1 diff)
• panel_settings_fancontrol.h (modified) (5 diffs)
• panel_settings_overclocking.h (modified) (20 diffs)
• panel_settings_redbutton.h (modified) (1 diff)
• panel_softcam.h (modified) (9 diffs)
• panel_system.h (modified) (12 diffs)
• panel_system_backup.h (modified) (5 diffs)
• panel_system_restore.h (modified) (6 diffs)

titan/plugins/panel/panel.c

@@ -2 +2 @@
 #include "../titan/debug.h"
 #include "../titan/header.h"
-#include "aafpanel_header.h"
-#include "aafpanel_global.h"
-#include "aafpanel_softcam.h"
-#include "aafpanel_settings.h"
-#include "aafpanel_system.h"
-#include "aafpanel_extensions.h"
-#include "aafpanel_infos.h"
-#include "aafpanel_infos_sysinfo.h"
-#include "aafpanel_settings_bluebutton.h"
-#include "aafpanel_settings_redbutton.h"
-#include "aafpanel_settings_autostart.h"
-#include "aafpanel_settings_overclocking.h"
-#include "aafpanel_settings_fancontrol.h"
-#include "aafpanel_system_restore.h"
-#include "aafpanel_system_backup.h"
-#include "aafpanel_ipk.h"
-#include "aafpanel_main.h"
+#include "panel_header.h"
+#include "panel_global.h"
+#include "panel_softcam.h"
+#include "panel_settings.h"
+#include "panel_system.h"
+#include "panel_extensions.h"
+#include "panel_infos.h"
+#include "panel_infos_sysinfo.h"
+#include "panel_settings_bluebutton.h"
+#include "panel_settings_redbutton.h"
+#include "panel_settings_autostart.h"
+#include "panel_settings_overclocking.h"
+#include "panel_settings_fancontrol.h"
+#include "panel_system_restore.h"
+#include "panel_system_backup.h"
+#include "panel_ipk.h"
+#include "panel_main.h"
 
 char pluginname[] = "Panel";
@@ -63 +63 @@
 void start(void)
 {
-        aafpanel_main();
+        panel_main();
 }

titan/plugins/panel/panel_extensions.h

@@ -1 @@
-#ifndef AAFPANEL_EXTENSIONS_H
-#define AAFPANEL_EXTENSIONS_H
+#ifndef PANEL_EXTENSIONS_H
+#define PANEL_EXTENSIONS_H
 
 
-void screenaafpanel_extensions(int mode)
+void screenpanel_extensions(int mode)
 {
         char* section = NULL;
@@ -14 +14 @@
                 tmpstr = get_ipk_section();
                 free(section); section = NULL;
-//              char* section = ostrcat(section, ipklistbox(NULL, tmpstr, NULL, "Ipk Install - select section", "%pluginpath%/aafpanel/skin/", 1), 1, 1);
-                section = ipklistbox(NULL, tmpstr, NULL, "Ipk Install - select section", "%pluginpath%/aafpanel/skin/", 1);
+//              char* section = ostrcat(section, ipklistbox(NULL, tmpstr, NULL, "Ipk Install - select section", "%pluginpath%/panel/skin/", 1), 1, 1);
+                section = ipklistbox(NULL, tmpstr, NULL, "Ipk Install - select section", "%pluginpath%/panel/skin/", 1);
                 free(tmpstr); tmpstr = NULL;
 
@@ -44 +44 @@
                         free(file); file = NULL;
                         free(tmpstr); tmpstr = NULL;
-                        screenaafpanel_extensions(0);
+                        screenpanel_extensions(0);
                 }
         }
@@ -51 +51 @@
                 tmpstr = get_ipk_listinstall();
                 free(file); file = NULL;
-//              file = ostrcat(file, ipklistbox(NULL, tmpstr, NULL, "Ipk Remove - select file", "%pluginpath%/aafpanel/skin/", 1), 1, 1);
-                file = ipklistbox(NULL, tmpstr, NULL, "Ipk Remove - select file", "%pluginpath%/aafpanel/skin/", 1);
+//              file = ostrcat(file, ipklistbox(NULL, tmpstr, NULL, "Ipk Remove - select file", "%pluginpath%/panel/skin/", 1), 1, 1);
+                file = ipklistbox(NULL, tmpstr, NULL, "Ipk Remove - select file", "%pluginpath%/panel/skin/", 1);
                 free(tmpstr); tmpstr = NULL;
                 debug(60, "file: %s", file);
@@ -67 +67 @@
                         free(tmpinfo); tmpinfo = NULL;
                         free(file); file = NULL;
-                        screenaafpanel_extensions(1);
+                        screenpanel_extensions(1);
                 }
                 free(file); file = NULL;

titan/plugins/panel/panel_global.h

@@ -1 @@
-#ifndef AAFPANEL_GLOBAL_H
-#define AAFPANEL_GLOBAL_H
+#ifndef PANEL_GLOBAL_H
+#define PANEL_GLOBAL_H
 
 #define MAXTOKENS       256

titan/plugins/panel/panel_header.h

@@ -1 @@
-#ifndef AAFPANEL_HEADER_H
-#define AAFPANEL_HEADER_H
+#ifndef PANEL_HEADER_H
+#define PANEL_HEADER_H
 
-// aafpanel_ipk.h
+// panel_ipk.h
 char* ipklistbox(char* defaultstr, char* str, char* skinname, char* skintitle, char* skinpath, int showpng);
 
 void screenplugin();
 
-// aafpanel_main.h
-int aafpanel_menucall(struct skin* aafpanel_menuentry);
+// panel_main.h
+int panel_menucall(struct skin* panel_menuentry);
 
 #endif

titan/plugins/panel/panel_infos.h

@@ -1 @@
-#ifndef AAFPANEL_INFOS_H
-#define AAFPANEL_INFOS_H
+#ifndef PANEL_INFOS_H
+#define PANEL_INFOS_H
 
-void screenaafpanel_infos(int mode)
+void screenpanel_infos(int mode)
 {
 
         char* tmpstr = NULL;
         int rcret = 0;
-        struct skin* aaf_info = getscreen("aafpanel_infos");
-        struct skin* info = getscreennode(aaf_info, "info");
+        struct skin* panel_info = getscreen("panel_infos");
+        struct skin* info = getscreennode(panel_info, "info");
 
-        addscreenrc(aaf_info, info);
+        addscreenrc(panel_info, info);
 
         if (mode == 0){
                 char* tmpstr1 = NULL, *tmpstr2 = NULL, *tmpstr3 = NULL;
 
-                changetitle(aaf_info, _("AAF Infos"));
+                changetitle(panel_info, _("Infos"));
 
                 tmpstr1 = command("cat /etc/motd");
@@ -33 +33 @@
                 char* tmpstr1 = NULL, *tmpstr2 = NULL;
 
-                changetitle(aaf_info, _("AAF Default"));
+                changetitle(panel_info, _("Default"));
 
                 tmpstr1 = ostrcat("Date = ", "", 0, 0);
@@ -64 +64 @@
 
         if (mode == 2){
-                changetitle(aaf_info, _("AAF Free Space"));
+                changetitle(panel_info, _("Free Space"));
 
                 tmpstr = command("df -h");
@@ -73 +73 @@
 
         if (mode == 3){
-                changetitle(aaf_info, _("AAF Kernel"));
+                changetitle(panel_info, _("Kernel"));
 
                 tmpstr = command("cat /proc/version");
@@ -82 +82 @@
 
         if (mode == 4){
-                changetitle(aaf_info, _("AAF Mounts"));
+                changetitle(panel_info, _("Mounts"));
 
                 tmpstr = command("mount");
@@ -93 +93 @@
                 char* tmpstr1 = NULL, *tmpstr2 = NULL;
 
-                changetitle(aaf_info, _("AAF Network"));
+                changetitle(panel_info, _("Network"));
 
                 tmpstr = command("ifconfig");
@@ -104 +104 @@
 
         if (mode == 6){
-                changetitle(aaf_info, _("AAF Ram"));
+                changetitle(panel_info, _("Ram"));
 
                 tmpstr = command("free");
@@ -112 +112 @@
         }
 
-        drawscreen(aaf_info, 0);
+        drawscreen(panel_info, 0);
 
         while(1)
         {
-                rcret = waitrc(aaf_info, 0, 0);
+                rcret = waitrc(panel_info, 0, 0);
 
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
@@ -122 +122 @@
         }
 
-        delownerrc(aaf_info);
-        clearscreen(aaf_info);
-        //delscreen(aaf_info);
+        delownerrc(panel_info);
+        clearscreen(panel_info);
+        //delscreen(panel_info);
 }
 

titan/plugins/panel/panel_infos_sysinfo.h

@@ -1 @@
-#ifndef AAFPANEL_INFOS_SYSINFO_H
-#define AAFPANEL_INFOS_SYSINFO_H
+#ifndef PANEL_INFOS_SYSINFO_H
+#define PANEL_INFOS_SYSINFO_H
 
-void screenaafpanel_infos_sysinfo(int mode)
+void screenpanel_infos_sysinfo(int mode)
 {
 
         char* tmpstr = NULL;
         int rcret = 0;
-        struct skin* aaf_info = getscreen("aafpanel_infos");
-        struct skin* info = getscreennode(aaf_info, "info");
+        struct skin* panel_info = getscreen("panel_infos");
+        struct skin* info = getscreennode(panel_info, "info");
 
-        addscreenrc(aaf_info, info);
+        addscreenrc(panel_info, info);
 
         if (mode == 0){
-                changetitle(aaf_info, _("AAF CPU info"));
+                changetitle(panel_info, _("CPU info"));
 
                 tmpstr = command("cat /proc/cpuinfo | sed 's/\t\t/\t/'");
@@ -22 +22 @@
 
         if (mode == 1){
-                changetitle(aaf_info, _("AAF Memory info"));
+                changetitle(panel_info, _("Memory info"));
 
                 tmpstr = command("cat /proc/meminfo");
@@ -31 +31 @@
 
         if (mode == 2){
-                changetitle(aaf_info, _("AAF MTD info"));
+                changetitle(panel_info, _("MTD info"));
 
                 tmpstr = command("cat /proc/mtd");
@@ -40 +40 @@
 
         if (mode == 3){
-                changetitle(aaf_info, _("AAF Module info"));
+                changetitle(panel_info, _("Module info"));
 
                 tmpstr = command("cat /proc/modules");
@@ -49 +49 @@
 
         if (mode == 4){
-                changetitle(aaf_info, _("AAF Devices"));
+                changetitle(panel_info, _("Devices"));
 
                 tmpstr = command("cat /proc/devices");
@@ -62 +62 @@
                 char* swap[] = {"Name: ", "Type: ", "Size: ", "Used: ", "Prio: "};
 
-                changetitle(aaf_info, _("AAF Swap info"));
+                changetitle(panel_info, _("Swap info"));
 
                 tmpstr1 = command("cat /proc/swaps | sed 's/\t/ /g; s/[ ]* / /g'");
@@ -99 +99 @@
 
         if (mode == 6){
-                changetitle(aaf_info, _("AAF Top info"));
+                changetitle(panel_info, _("Top info"));
 
                 //tmpstr = command("top -b -n1");
@@ -108 +108 @@
         }
 
-        drawscreen(aaf_info, 0);
+        drawscreen(panel_info, 0);
 
         while(1)
         {
-                rcret = waitrc(aaf_info, 0, 0);
+                rcret = waitrc(panel_info, 0, 0);
 
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
@@ -118 +118 @@
         }
 
-        delownerrc(aaf_info);
-        clearscreen(aaf_info);
-        //delscreen(aaf_info);
+        delownerrc(panel_info);
+        clearscreen(panel_info);
+        //delscreen(panel_info);
 }
 

titan/plugins/panel/panel_ipk.h

@@ -1 @@
-#ifndef AAFPANEL_IPK_H
-#define AAFPANEL_IPK_H
+#ifndef PANEL_IPK_H
+#define PANEL_IPK_H
 
 // showpng = 0 (no icon)
@@ -187 +187 @@
                                                 tmpstr6 = ostrcat("", skinpath1, 0, 0);
                                                 ret6 = strsplit(tmpstr6, "%", &count6);
-                                                defaultdir = ostrcat(getconfig("skinpath", NULL), "/skin/aafpanel_", 0, 0);
+                                                defaultdir = ostrcat(getconfig("skinpath", NULL), "/skin/panel_", 0, 0);
                                                 defaultdir = ostrcat(defaultdir, (&ret1[i])->part, 1, 0);
                                                 defaultdir = ostrcat(defaultdir, ".png", 1, 0);
@@ -194 +194 @@
                                                 {
                                                         defaultdir = ostrcat(getconfig("pluginpath", NULL), (&ret6[1])->part, 0, 0);
-                                                        defaultdir = ostrcat(defaultdir, "aafpanel_", 0, 0);
+                                                        defaultdir = ostrcat(defaultdir, "panel_", 0, 0);
                                                         defaultdir = ostrcat(defaultdir, (&ret1[i])->part, 1, 0);
                                                         defaultdir = ostrcat(defaultdir, ".png", 1, 0);
@@ -201 +201 @@
                                         } else {
                                                 defaultdir = ostrcat(getconfig("skinpath", NULL), skinpath1, 0, 0);
-                                                defaultdir = ostrcat(defaultdir, "/skin/aafpanel_", 0, 0);
+                                                defaultdir = ostrcat(defaultdir, "/skin/panel_", 0, 0);
                                                 defaultdir = ostrcat(defaultdir, (&ret1[i])->part, 1, 0);
                                                 defaultdir = ostrcat(defaultdir, ".png", 1, 0);
@@ -215 +215 @@
                                         else
                                         {
-                                                tmpskinpath = ostrcat(skinpath1, "aafpanel_default.png", 0, 0);
+                                                tmpskinpath = ostrcat(skinpath1, "panel_default.png", 0, 0);
                                                 changepic(tmp, tmpskinpath);
                                                 free(tmpskinpath); tmpskinpath = NULL;

titan/plugins/panel/panel_main.h

@@ -1 @@
-#ifndef AAFPANEL_MAIN_H
-#define AAFPANEL_MAIN_H
-
-struct skin* aafpanel_menu(struct skin* aafpanel_menu)
+#ifndef PANEL_MAIN_H
+#define PANEL_MAIN_H
+
+struct skin* panel_menu(struct skin* panel_menu)
 {
         debug(1000, "in");
         int rcret = 0, ret = 0;
-        struct skin* listbox = getscreennode(aafpanel_menu, "listbox");
-//      struct skin* aafpanel_softcam_menu = getscreen("aafpanel_softcam");
-
-        if(listbox == NULL || aafpanel_menu == NULL)
+        struct skin* listbox = getscreennode(panel_menu, "listbox");
+//      struct skin* panel_softcam_menu = getscreen("panel_softcam");
+
+        if(listbox == NULL || panel_menu == NULL)
         {
                 debug(1000, "out -> NULL detect");
@@ -16 +16 @@
 
 //      if(checkemu() != 1)
-//              aafpanel_softcam_menu->hidden == YES;
+//              panel_softcam_menu->hidden == YES;
 //      else
-//              aafpanel_softcam_menu->hidden == NO;
-
-        drawscreen(aafpanel_menu, 0);
-        addscreenrc(aafpanel_menu, listbox);
+//              panel_softcam_menu->hidden == NO;
+
+        drawscreen(panel_menu, 0);
+        addscreenrc(panel_menu, listbox);
 
         while(1)
         {
-                rcret = waitrc(aafpanel_menu, 0, 0);
+                rcret = waitrc(panel_menu, 0, 0);
 
                 if (rcret == getrcconfigint("rcexit", NULL)) break;
                 if(rcret == getrcconfigint("rcok", NULL))
                 {
-                        clearscreen(aafpanel_menu);
-                        ret = aafpanel_menucall(listbox->select);
+                        clearscreen(panel_menu);
+                        ret = panel_menucall(listbox->select);
                         if(ret != 0)
                                 textbox(_("Message"), _("Menu not implemented !"), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                        drawscreen(aafpanel_menu, 0);
+                        drawscreen(panel_menu, 0);
                 }
         }
 
-        delownerrc(aafpanel_menu);
-        clearscreen(aafpanel_menu);
+        delownerrc(panel_menu);
+        clearscreen(panel_menu);
         debug(1000, "out");
         return listbox->select;
 }
 
-int aafpanel_menucall(struct skin* aafpanel_menuentry)
+int panel_menucall(struct skin* panel_menuentry)
 {
         debug(1000, "in");
@@ -50 +50 @@
         int ret = 0;
 
-        if(aafpanel_menuentry == NULL)
+        if(panel_menuentry == NULL)
         {
                 debug(1000, "out -> NULL detect");
@@ -56 +56 @@
         }
 
-        printf("MENU: %s\n", aafpanel_menuentry->name); // must be removed later
+        printf("MENU: %s\n", panel_menuentry->name);    // must be removed later
 
 // softcam
-        if(ostrcmp("aafpanel_softcam", aafpanel_menuentry->name) == 0){
-                screenaafpanel_softcam();
+        if(ostrcmp("panel_softcam", panel_menuentry->name) == 0){
+                screenpanel_softcam();
 // settings
-        } else if(ostrcmp("aafpanel_settings", aafpanel_menuentry->name) == 0){
-                struct skin* screen = getscreen("aafpanel_settings_main");
+        } else if(ostrcmp("panel_settings", panel_menuentry->name) == 0){
+                struct skin* screen = getscreen("panel_settings_main");
 
                 if(checkbeta() != 1)
-                        delscreennode(screen, "aafpanel_settings_betacfg");
+                        delscreennode(screen, "panel_settings_betacfg");
 
                 if(checkbox("UFS922") != 1)
-                        delscreennode(screen, "aafpanel_settings_fancontrol");
+                        delscreennode(screen, "panel_settings_fancontrol");
 
                 if(isfile("/proc/cpu_frequ/pll0_ndiv_mdiv") != 1)
-                        delscreennode(screen, "aafpanel_settings_overclocking");
-
-                aafpanel_menu(screen);
-
-        } else if(ostrcmp("aafpanel_settings_overclocking", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_overclocking();
-        } else if(ostrcmp("aafpanel_settings_betacfg", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings(0);
-        } else if(ostrcmp("aafpanel_settings_automount", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings(1);
-        } else if(ostrcmp("aafpanel_settings_redbutton", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_redbutton();
-        } else if(ostrcmp("aafpanel_settings_bluebutton", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_bluebutton();
-        } else if(ostrcmp("aafpanel_settings_autostart", aafpanel_menuentry->name) == 0){
-                struct skin* screen = getscreen("aafpanel_autostart_main");
-                aafpanel_menu(screen);
-        } else if(ostrcmp("aafpanel_settings_fancontrol", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_fancontrol();
+                        delscreennode(screen, "panel_settings_overclocking");
+
+                panel_menu(screen);
+
+        } else if(ostrcmp("panel_settings_overclocking", panel_menuentry->name) == 0){
+                screenpanel_settings_overclocking();
+        } else if(ostrcmp("panel_settings_betacfg", panel_menuentry->name) == 0){
+                screenpanel_settings(0);
+        } else if(ostrcmp("panel_settings_automount", panel_menuentry->name) == 0){
+                screenpanel_settings(1);
+        } else if(ostrcmp("panel_settings_redbutton", panel_menuentry->name) == 0){
+                screenpanel_settings_redbutton();
+        } else if(ostrcmp("panel_settings_bluebutton", panel_menuentry->name) == 0){
+                screenpanel_settings_bluebutton();
+        } else if(ostrcmp("panel_settings_autostart", panel_menuentry->name) == 0){
+                struct skin* screen = getscreen("panel_autostart_main");
+                panel_menu(screen);
+        } else if(ostrcmp("panel_settings_fancontrol", panel_menuentry->name) == 0){
+                screenpanel_settings_fancontrol();
 // system
-        } else if(ostrcmp("aafpanel_system", aafpanel_menuentry->name) == 0){
-                struct skin* screen = getscreen("aafpanel_system_main");
-                aafpanel_menu(screen);
-        } else if(ostrcmp("aafpanel_system_restore", aafpanel_menuentry->name) == 0){
-                screenaafpanel_system_restore();
-        } else if(ostrcmp("aafpanel_system_backup", aafpanel_menuentry->name) == 0){
-                screenaafpanel_system_backup();
-        } else if(ostrcmp("aafpanel_system_imageinfo", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos(0);
-        } else if(ostrcmp("aafpanel_system_update_flash_online", aafpanel_menuentry->name) == 0){
-                screenaafpanel_system_update(0);
-        } else if(ostrcmp("aafpanel_system_update_flash_tmp", aafpanel_menuentry->name) == 0){
-                screenaafpanel_system_update(1);
-        } else if(ostrcmp("aafpanel_system_update_usb_online", aafpanel_menuentry->name) == 0){
-                screenaafpanel_system_update(2);
-        } else if(ostrcmp("aafpanel_system_update_usb_tmp", aafpanel_menuentry->name) == 0){
-                screenaafpanel_system_update(3);
+        } else if(ostrcmp("panel_system", panel_menuentry->name) == 0){
+                struct skin* screen = getscreen("panel_system_main");
+                panel_menu(screen);
+        } else if(ostrcmp("panel_system_restore", panel_menuentry->name) == 0){
+                screenpanel_system_restore();
+        } else if(ostrcmp("panel_system_backup", panel_menuentry->name) == 0){
+                screenpanel_system_backup();
+        } else if(ostrcmp("panel_system_imageinfo", panel_menuentry->name) == 0){
+                screenpanel_infos(0);
+        } else if(ostrcmp("panel_system_update_flash_online", panel_menuentry->name) == 0){
+                screenpanel_system_update(0);
+        } else if(ostrcmp("panel_system_update_flash_tmp", panel_menuentry->name) == 0){
+                screenpanel_system_update(1);
+        } else if(ostrcmp("panel_system_update_usb_online", panel_menuentry->name) == 0){
+                screenpanel_system_update(2);
+        } else if(ostrcmp("panel_system_update_usb_tmp", panel_menuentry->name) == 0){
+                screenpanel_system_update(3);
 // extensions
-        } else if(ostrcmp("aafpanel_extensions", aafpanel_menuentry->name) == 0){
-                struct skin* screen = getscreen("aafpanel_extensions_main");
-                aafpanel_menu(screen);
-        } else if(ostrcmp("aafpanel_extensions_menu", aafpanel_menuentry->name) == 0){
+        } else if(ostrcmp("panel_extensions", panel_menuentry->name) == 0){
+                struct skin* screen = getscreen("panel_extensions_main");
+                panel_menu(screen);
+        } else if(ostrcmp("panel_extensions_menu", panel_menuentry->name) == 0){
                 screenplugin();
-        } else if(ostrcmp("aafpanel_extensions_ipkinstall", aafpanel_menuentry->name) == 0){
-                screenaafpanel_extensions(0);
-        } else if(ostrcmp("aafpanel_extensions_ipkremove", aafpanel_menuentry->name) == 0){
-                screenaafpanel_extensions(1);
-        } else if(ostrcmp("aafpanel_extensions_tmpipkinstall", aafpanel_menuentry->name) == 0){
-                screenaafpanel_extensions(2);
+        } else if(ostrcmp("panel_extensions_ipkinstall", panel_menuentry->name) == 0){
+                screenpanel_extensions(0);
+        } else if(ostrcmp("panel_extensions_ipkremove", panel_menuentry->name) == 0){
+                screenpanel_extensions(1);
+        } else if(ostrcmp("panel_extensions_tmpipkinstall", panel_menuentry->name) == 0){
+                screenpanel_extensions(2);
 // infos main
-        } else if(ostrcmp("aafpanel_infos", aafpanel_menuentry->name) == 0){
-                struct skin* screen = getscreen("aafpanel_infos_main");
-                aafpanel_menu(screen);
-        } else if(ostrcmp("aafpanel_infos_aaf", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos(0);
-        } else if(ostrcmp("aafpanel_infos_default", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos(1);
-        } else if(ostrcmp("aafpanel_infos_free", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos(2);
-        } else if(ostrcmp("aafpanel_infos_kernel", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos(3);
-        } else if(ostrcmp("aafpanel_infos_mounts", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos(4);
-        } else if(ostrcmp("aafpanel_infos_network", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos(5);
-        } else if(ostrcmp("aafpanel_infos_ram", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos(6);
+        } else if(ostrcmp("panel_infos_main", panel_menuentry->name) == 0){
+                struct skin* screen = getscreen("panel_infos_main");
+                panel_menu(screen);
+        } else if(ostrcmp("panel_infos", panel_menuentry->name) == 0){
+                screenpanel_infos(0);
+        } else if(ostrcmp("panel_infos_default", panel_menuentry->name) == 0){
+                screenpanel_infos(1);
+        } else if(ostrcmp("panel_infos_free", panel_menuentry->name) == 0){
+                screenpanel_infos(2);
+        } else if(ostrcmp("panel_infos_kernel", panel_menuentry->name) == 0){
+                screenpanel_infos(3);
+        } else if(ostrcmp("panel_infos_mounts", panel_menuentry->name) == 0){
+                screenpanel_infos(4);
+        } else if(ostrcmp("panel_infos_network", panel_menuentry->name) == 0){
+                screenpanel_infos(5);
+        } else if(ostrcmp("panel_infos_ram", panel_menuentry->name) == 0){
+                screenpanel_infos(6);
 // infos sysinfos
-        } else if(ostrcmp("aafpanel_infos_sysinfo", aafpanel_menuentry->name) == 0){
-                struct skin* screen = getscreen("aafpanel_sysinfos_main");
-                aafpanel_menu(screen);
-        } else if(ostrcmp("aafpanel_sysinfos_cpu", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos_sysinfo(0);
-        } else if(ostrcmp("aafpanel_sysinfos_mem", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos_sysinfo(1);
-        } else if(ostrcmp("aafpanel_sysinfos_mtd", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos_sysinfo(2);
-        } else if(ostrcmp("aafpanel_sysinfos_module", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos_sysinfo(3);
-        } else if(ostrcmp("aafpanel_sysinfos_devices", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos_sysinfo(4);
-        } else if(ostrcmp("aafpanel_sysinfos_swap", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos_sysinfo(5);
-        } else if(ostrcmp("aafpanel_sysinfos_top", aafpanel_menuentry->name) == 0){
-                screenaafpanel_infos_sysinfo(6);
+        } else if(ostrcmp("panel_infos_sysinfo", panel_menuentry->name) == 0){
+                struct skin* screen = getscreen("panel_sysinfos_main");
+                panel_menu(screen);
+        } else if(ostrcmp("panel_sysinfos_cpu", panel_menuentry->name) == 0){
+                screenpanel_infos_sysinfo(0);
+        } else if(ostrcmp("panel_sysinfos_mem", panel_menuentry->name) == 0){
+                screenpanel_infos_sysinfo(1);
+        } else if(ostrcmp("panel_sysinfos_mtd", panel_menuentry->name) == 0){
+                screenpanel_infos_sysinfo(2);
+        } else if(ostrcmp("panel_sysinfos_module", panel_menuentry->name) == 0){
+                screenpanel_infos_sysinfo(3);
+        } else if(ostrcmp("panel_sysinfos_devices", panel_menuentry->name) == 0){
+                screenpanel_infos_sysinfo(4);
+        } else if(ostrcmp("panel_sysinfos_swap", panel_menuentry->name) == 0){
+                screenpanel_infos_sysinfo(5);
+        } else if(ostrcmp("panel_sysinfos_top", panel_menuentry->name) == 0){
+                screenpanel_infos_sysinfo(6);
 // autostart
-        } else if(ostrcmp("aafpanel_autostart_default", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_autostart(0);
-        } else if(ostrcmp("aafpanel_autostart_audiovideo", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_autostart(1);
-        } else if(ostrcmp("aafpanel_autostart_usb", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_autostart(2);
-        } else if(ostrcmp("aafpanel_autostart_emu", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_autostart(3);
-        } else if(ostrcmp("aafpanel_autostart_network", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_autostart(4);
-        } else if(ostrcmp("aafpanel_autostart_safety", aafpanel_menuentry->name) == 0){
-                screenaafpanel_settings_autostart(5);
+        } else if(ostrcmp("panel_autostart_default", panel_menuentry->name) == 0){
+                screenpanel_settings_autostart(0);
+        } else if(ostrcmp("panel_autostart_audiovideo", panel_menuentry->name) == 0){
+                screenpanel_settings_autostart(1);
+        } else if(ostrcmp("panel_autostart_usb", panel_menuentry->name) == 0){
+                screenpanel_settings_autostart(2);
+        } else if(ostrcmp("panel_autostart_emu", panel_menuentry->name) == 0){
+                screenpanel_settings_autostart(3);
+        } else if(ostrcmp("panel_autostart_network", panel_menuentry->name) == 0){
+                screenpanel_settings_autostart(4);
+        } else if(ostrcmp("panel_autostart_safety", panel_menuentry->name) == 0){
+                screenpanel_settings_autostart(5);
 // videotune
-        } else if(ostrcmp("aafpanel_settings_videotune", aafpanel_menuentry->name) == 0){
+        } else if(ostrcmp("panel_settings_videotune", panel_menuentry->name) == 0){
                 screenvideosettings();
         } else {
@@ -181 +181 @@
 }
 
-void aafpanel_main()
+void panel_main()
 {
         debug(1000, "in");
@@ -187 +187 @@
         int rcret = 0, ret = 0;
 
-        struct skin* aafpanel_main = getscreen("aafpanel_main");
-        struct skin* listbox = getscreennode(aafpanel_main, "listbox");
-
-        struct skin* aafpanel_main_selected = getscreennode(aafpanel_main, "aafpanel_main_selected_pic");
+        struct skin* panel_main = getscreen("panel_main");
+        struct skin* listbox = getscreennode(panel_main, "listbox");
+
+        struct skin* panel_main_selected = getscreennode(panel_main, "panel_main_selected_pic");
         struct skin* child = NULL;
 
-        drawscreen(aafpanel_main, 1);
-        addscreenrc(aafpanel_main, listbox);
+        drawscreen(panel_main, 1);
+        addscreenrc(panel_main, listbox);
 
         listbox->aktpage = -1;
@@ -202 +202 @@
         while(child != NULL)
         {
-                if(ostrcmp(child->name, "aafpanel_softcam") == 0){
+                if(ostrcmp(child->name, "panel_softcam") == 0){
                         if(checkemu() == 0){
                                 child->hidden = YES;
@@ -215 +215 @@
         }
 
-        drawscreen(aafpanel_main, 0);
+        drawscreen(panel_main, 0);
         if(listbox->select != NULL)
         {
@@ -225 +225 @@
         {
                 status.screencalc = 1;
-                rcret = waitrc(aafpanel_main, 0, 0);
+                rcret = waitrc(panel_main, 0, 0);
                 status.screencalc = 0;
 
@@ -232 +232 @@
                 if(rcret == getrcconfigint("rcok", NULL))
                 {
-                        clearscreen(aafpanel_main);
-                        ret = aafpanel_menucall(listbox->select);
+                        clearscreen(panel_main);
+                        ret = panel_menucall(listbox->select);
                         if(ret != 0)
                                 textbox(_("Message"), _("Menu not implemented !"), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                        drawscreen(aafpanel_main, 0);
+                        drawscreen(panel_main, 0);
                 }
-                        debug(10, "[aafpanal_main] (select) menu=%s", listbox->select->name);
+                        debug(10, "[panal_main] (select) menu=%s", listbox->select->name);
                 if(listbox->select != NULL && (rcret == getrcconfigint("rcup", NULL) || rcret == getrcconfigint("rcdown", NULL)))
                 {
 
-                        debug(10, "[aafpanal_main] (select) menu=%s", listbox->select->name);
-                        if(ostrcmp(listbox->select->name, "aafpanel_softcam") == 0){
-                                changepic(aafpanel_main_selected, "panel/skin/aafpanel_softcam.png");
-                        } else if(ostrcmp(listbox->select->name, "aafpanel_settings") == 0){
-                                changepic(aafpanel_main_selected, "panel/skin/aafpanel_settings.png");
-                        } else if(ostrcmp(listbox->select->name, "aafpanel_system") == 0){
-                                changepic(aafpanel_main_selected, "panel/skin/aafpanel_system.png");
-                        } else if(ostrcmp(listbox->select->name, "aafpanel_extensions") == 0){
-                                changepic(aafpanel_main_selected, "panel/skin/aafpanel_extensions.png");
-                        } else if(ostrcmp(listbox->select->name, "aafpanel_infos") == 0){
-                                changepic(aafpanel_main_selected, "panel/skin/aafpanel_infos.png");
+                        debug(10, "[panal_main] (select) menu=%s", listbox->select->name);
+                        if(ostrcmp(listbox->select->name, "panel_softcam") == 0){
+                                changepic(panel_main_selected, "panel/skin/panel_softcam.png");
+                        } else if(ostrcmp(listbox->select->name, "panel_settings") == 0){
+                                changepic(panel_main_selected, "panel/skin/panel_settings.png");
+                        } else if(ostrcmp(listbox->select->name, "panel_system") == 0){
+                                changepic(panel_main_selected, "panel/skin/panel_system.png");
+                        } else if(ostrcmp(listbox->select->name, "panel_extensions") == 0){
+                                changepic(panel_main_selected, "panel/skin/panel_extensions.png");
+                        } else if(ostrcmp(listbox->select->name, "panel_infos") == 0){
+                                changepic(panel_main_selected, "panel/skin/panel_infos.png");
                         }
                 }
-                drawscreen(aafpanel_main, 0);
+                drawscreen(panel_main, 0);
                 if(listbox->select != NULL)
                         writevfd(listbox->select->text);
         }
 
-        delownerrc(aafpanel_main);
-        clearscreen(aafpanel_main);
-        //delscreen(aafpanel_main);
+        delownerrc(panel_main);
+        clearscreen(panel_main);
+        //delscreen(panel_main);
         status.hangtime = getconfigint("hangtime", NULL);
         debug(1000, "out");

titan/plugins/panel/panel_settings.h

@@ -1 @@
-#ifndef AAFPANEL_SETTINGS_H
-#define AAFPANEL_SETTINGS_H
+#ifndef PANEL_SETTINGS_H
+#define PANEL_SETTINGS_H
 
 // mode 0 = Betaconfig
@@ -6 +6 @@
 // mode 2 = Red Button
 
-void screenaafpanel_settings(int mode)
+void screenpanel_settings(int mode)
 {
         int rcret = 0;
-        struct skin* aaf_config = getscreen("aafpanel_config");
-        struct skin* listbox = getscreennode(aaf_config, "listbox");
+        struct skin* config = getscreen("panel_config");
+        struct skin* listbox = getscreennode(config, "listbox");
         struct skin* node = NULL;
         struct skin* tmp = NULL;
 
-        addscreenrc(aaf_config, listbox);
+        addscreenrc(config, listbox);
         listbox->aktline = 1;
         listbox->aktpage = 1;
 
         if (mode == 0){
-                changetitle(aaf_config, _("AAF Beta Config"));
+                changetitle(config, _("Beta Config"));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(config, listbox, node, 1);
                 node->type = INPUTBOX;
                 changetext(node, _("User"));
@@ -27 +27 @@
                 changeinput(node, getownconfigq(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(config, listbox, node, 1);
                 node->type = INPUTBOX;
                 changetext(node, _("Password"));
@@ -35 +35 @@
 
         if (mode == 1){
-                changetitle(aaf_config, _("AAF Automount Config"));
+                changetitle(config, _("Automount Config"));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Ntfs Write"));
@@ -48 +48 @@
 
         if (mode == 2){
-                changetitle(aaf_config, _("AAF Red Button Config"));
+                changetitle(config, _("Red Button Config"));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(config, listbox, node, 1);
                 node->type = CHOICEBOX;
-                changetext(node, _("Open AAF-Panel when pressing red button:"));
+                changetext(node, _("Open Panel when pressing red button:"));
                 changename(node, "redpanel");
                 addchoicebox(node, "0", _("no"));
@@ -59 +59 @@
         }
 
-        drawscreen(aaf_config, 0);
+        drawscreen(config, 0);
         tmp = listbox->select;
 
         while(1)
         {
-                addscreenrc(aaf_config, tmp);
-                rcret = waitrc(aaf_config, 0, 0);
+                addscreenrc(config, tmp);
+                rcret = waitrc(config, 0, 0);
                 tmp = listbox->select;
 
@@ -88 +88 @@
 
         delownconfigtmpall();
-        delmarkedscreennodes(aaf_config, 1);
-        delownerrc(aaf_config);
-        clearscreen(aaf_config);
+        delmarkedscreennodes(config, 1);
+        delownerrc(config);
+        clearscreen(config);
 }
 

titan/plugins/panel/panel_settings_autostart.h

@@ -1 @@
-#ifndef AAFPANEL_SETTINGS_AUTOSTART_H
-#define AAFPANEL_SETTINGS_AUTOSTART_H
+#ifndef PANEL_SETTINGS_AUTOSTART_H
+#define PANEL_SETTINGS_AUTOSTART_H
 
 // mode 0 = Defaults
@@ -9 +9 @@
 // mode 5 = Child safety
 
-void screenaafpanel_settings_autostart(int mode)
+void screenpanel_settings_autostart(int mode)
 {
         int rcret = 0;
-        struct skin* aaf_config = getscreen("aafpanel_config");
-        struct skin* listbox = getscreennode(aaf_config, "listbox");
+        struct skin* panel_config = getscreen("panel_config");
+        struct skin* listbox = getscreennode(panel_config, "listbox");
         struct skin* node = NULL;
         struct skin* tmp = NULL;
 
-        addscreenrc(aaf_config, listbox);
+        addscreenrc(panel_config, listbox);
         listbox->aktline = 1;
         listbox->aktpage = 1;
@@ -24 +24 @@
                 int i = 0;
 
-                changetitle(aaf_config, _("AAF autostart Defaults"));
+                changetitle(panel_config, _("Autostart Defaults"));
 
                 if(file_exist("/etc/.usbimage")){
-                        node = addlistbox(aaf_config, listbox, node, 1);
+                        node = addlistbox(panel_config, listbox, node, 1);
                         node->type = CHOICEBOX;
                         changetext(node, _("fsckroot")); changename(node, "fsckroot");
@@ -34 +34 @@
                 }
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("bootstop")); changename(node, "bootstop");
@@ -46 +46 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("debug")); changename(node, "debug");
@@ -53 +53 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("logto")); changename(node, "logto");
@@ -60 +60 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("errorboot")); changename(node, "errorboot");
@@ -66 +66 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("repairmodus")); changename(node, "repairmodus");
@@ -73 +73 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("rmcrashlog")); changename(node, "rmcrashlog");
@@ -79 +79 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("rmemthy")); changename(node, "rmemthy");
@@ -85 +85 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("plugload")); changename(node, "plugload");
@@ -91 +91 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("progressbar")); changename(node, "progressbar");
@@ -97 +97 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("showip")); changename(node, "showip");
@@ -103 +103 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("showtvinfo")); changename(node, "showtvinfo");
@@ -109 +109 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("playlist")); changename(node, "playlist");
@@ -115 +115 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("updatelist")); changename(node, "updatelist");
@@ -130 +130 @@
         if (mode == 1){
 
-                changetitle(aaf_config, _("AAF autostart Defaults"));
+                changetitle(panel_config, _("Autostart Defaults"));
 
                 if(isfile("/var/bin/audio.elf") || isfile("/boot/audio.old.elf")){
-                        node = addlistbox(aaf_config, listbox, node, 1);
+                        node = addlistbox(panel_config, listbox, node, 1);
                         node->type = CHOICEBOX;
                         changetext(node, _("Old Audiofw")); changename(node, "oldaudiofw");
@@ -140 +140 @@
                 }
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("No Audiosync")); changename(node, "noaudiosync");
@@ -146 +146 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Boot Resolution")); changename(node, "BootResolution");
@@ -152 +152 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Bootlogo")); changename(node, "bootlogo");
@@ -158 +158 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Poweroff")); changename(node, "poweroff");
@@ -164 +164 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Scart On Standby")); changename(node, "scartonstandby");
@@ -170 +170 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("HighSR")); changename(node, "HighSR");
@@ -176 +176 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Tuner Sleep Off")); changename(node, "tuner_sleep_off");
@@ -182 +182 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Boot RGB Fix")); changename(node, "bootrgbfix");
@@ -193 +193 @@
                 int tmpsize = 0;
 
-                changetitle(aaf_config, _("AAF autostart USB"));
-
-                node = addlistbox(aaf_config, listbox, node, 1);
+                changetitle(panel_config, _("Autostart USB"));
+
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Load Partition")); changename(node, "loadpartition");
@@ -201 +201 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Fsck Record")); changename(node, "fsckrecord");
@@ -207 +207 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Swap")); changename(node, "swap");
                 addchoicebox(node, "y", _("yes")); addchoicebox(node, "n", _("no"));
                 setchoiceboxselection(node, getownconfig(node->name));
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Swap Size")); changename(node, "swapsize");
@@ -226 +226 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Fsck Swap")); changename(node, "fsckswap");
@@ -232 +232 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Record Max Sectors")); changename(node, "RecordMaxSectors");
@@ -246 +246 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Swap Max Sectors")); changename(node, "SwapMaxSectors");
@@ -264 +264 @@
         if (mode == 3){
 
-                changetitle(aaf_config, _("AAF autostart EMU"));
-
-                node = addlistbox(aaf_config, listbox, node, 1);
+                changetitle(panel_config, _("Autostart EMU"));
+
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Emu Control")); changename(node, "emucontrol");
@@ -272 +272 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("ftdi")); changename(node, "ftdi");
@@ -278 +278 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("pl2303")); changename(node, "pl2303");
@@ -284 +284 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Nr Usbreaders")); changename(node, "nr_usbreaders");
@@ -293 +293 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Iwatch")); changename(node, "iwatch");
@@ -302 +302 @@
         if (mode == 4){
 
-                changetitle(aaf_config, "AAF autostart NETWORK");
-
-                node = addlistbox(aaf_config, listbox, node, 1);
+                changetitle(panel_config, "Autostart NETWORK");
+
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("nfs server")); changename(node, "nfsserver");
@@ -310 +310 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("samba server")); changename(node, "sambaserver");
@@ -316 +316 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("scan wlan")); changename(node, "wlan");
@@ -325 +325 @@
         if (mode == 5){
 
-                changetitle(aaf_config, _("AAF autostart Child Safety"));
-
-                node = addlistbox(aaf_config, listbox, node, 1);
+                changetitle(panel_config, _("Autostart Child Safety"));
+
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = CHOICEBOX;
                 changetext(node, _("Parental")); changename(node, "Parental");
@@ -333 +333 @@
                 setchoiceboxselection(node, getownconfig(node->name));
 
-                node = addlistbox(aaf_config, listbox, node, 1);
+                node = addlistbox(panel_config, listbox, node, 1);
                 node->type = INPUTBOXNUM;
                 changetext(node, _("Pin")); changename(node, "Pin");
@@ -344 +344 @@
         }
 
-        drawscreen(aaf_config, 0);
+        drawscreen(panel_config, 0);
         tmp = listbox->select;
 
         while(1)
         {
-                addscreenrc(aaf_config, tmp);
-                rcret = waitrc(aaf_config, 0, 0);
+                addscreenrc(panel_config, tmp);
+                rcret = waitrc(panel_config, 0, 0);
                 tmp = listbox->select;
 
@@ -370 +370 @@
 
         delownconfigtmpall();
-        delmarkedscreennodes(aaf_config, 1);
-        delownerrc(aaf_config);
-        clearscreen(aaf_config);
+        delmarkedscreennodes(panel_config, 1);
+        delownerrc(panel_config);
+        clearscreen(panel_config);
 }
 

titan/plugins/panel/panel_settings_bluebutton.h

@@ -1 @@
-#ifndef AAFPANEL_SETTINGS_BLUEBUTTON_H
-#define AAFPANEL_SETTINGS_BLUEBUTTON_H
+#ifndef PANEL_SETTINGS_BLUEBUTTON_H
+#define PANEL_SETTINGS_BLUEBUTTON_H
 
-void screenaafpanel_settings_bluebutton()
+void screenpanel_settings_bluebutton()
 {
         debug(1000, "in");

titan/plugins/panel/panel_settings_fancontrol.h

@@ -1 @@
-#ifndef AAFPANEL_SETTINGS_FANCONTROL_H
-#define AAFPANEL_SETTINGS_FANCONTROL_H
+#ifndef PANEL_SETTINGS_FANCONTROL_H
+#define PANEL_SETTINGS_FANCONTROL_H
 
 
 
-void screenaafpanel_settings_fancontrol()
+void screenpanel_settings_fancontrol()
 {
         int rcret = 0;
@@ -10 +10 @@
         char* speedWert = NULL;
         
-        struct skin* aaf_fancontrol = getscreen("aafpanel_settings_fancontrol");
-        struct skin* fanprogress = getscreennode(aaf_fancontrol, "fanprogress");
+        struct skin* panel_fancontrol = getscreen("panel_settings_fancontrol");
+        struct skin* fanprogress = getscreennode(panel_fancontrol, "fanprogress");
 
         speedWert = getconfig("fanspeed", NULL);
@@ -31 +31 @@
                 
         fanprogress->progresssize = speed;
-        drawscreen(aaf_fancontrol, 0);
+        drawscreen(panel_fancontrol, 0);
 
         while(1)
         {
-                rcret = waitrc(aaf_fancontrol, 0, 0);
+                rcret = waitrc(panel_fancontrol, 0, 0);
 
                 if(rcret == getrcconfigint("rcexit", NULL)) {
@@ -50 +50 @@
                         fanprogress->progresssize = speed;
                         setfanspeed(speed, 0);
-                        drawscreen(aaf_fancontrol, 0);
+                        drawscreen(panel_fancontrol, 0);
                 }
                 if(rcret == getrcconfigint("rcright", NULL)){
@@ -57 +57 @@
                         fanprogress->progresssize = speed;
                         setfanspeed(speed, 0);
-                        drawscreen(aaf_fancontrol, 0);
+                        drawscreen(panel_fancontrol, 0);
                 }
         }

titan/plugins/panel/panel_settings_overclocking.h

@@ -1 @@
-#ifndef AAFPANEL_SETTINGS_OVERCLOCKING_H
-#define AAFPANEL_SETTINGS_OVERCLOCKING_H
+#ifndef PANEL_SETTINGS_OVERCLOCKING_H
+#define PANEL_SETTINGS_OVERCLOCKING_H
 
 void read_cpufreq(struct skin* label)
@@ -69 +69 @@
         if(isfile("/proc/cpu_frequ/pll0_ndiv_mdiv") == 0)
         {
-                debug(10, "[screenaafpanel_settings_overclock] file not found%s", "/proc/cpu_frequ/pll0_ndiv_mdiv");
-                return;
-        }
-
-        debug(10, "[screenaafpanel_settings_overclock] inifreq=%s oldfreq=%s => newfreq=%s", inifreq, oldfreq, newfreq);
+                debug(10, "[screenpanel_settings_overclock] file not found%s", "/proc/cpu_frequ/pll0_ndiv_mdiv");
+                return;
+        }
+
+        debug(10, "[screenpanel_settings_overclock] inifreq=%s oldfreq=%s => newfreq=%s", inifreq, oldfreq, newfreq);
 
         if(ostrcmp(newfreq, inifreq) == 0 && ostrcmp(newfreq, oldfreq) == 0)
         {
-                debug(10, "[screenaafpanel_settings_overclock] Nothing to change in FREQ");
+                debug(10, "[screenpanel_settings_overclock] Nothing to change in FREQ");
                 return;
         }
@@ -87 +87 @@
         tmpstr = ostrcat(tmpstr, "\" > /proc/cpu_frequ/pll0_ndiv_mdiv", 1, 0);
 
-        debug(10, "[screenaafpanel_settings_overclock] Set FREQ to %s", newfreq);
+        debug(10, "[screenpanel_settings_overclock] Set FREQ to %s", newfreq);
         system(tmpstr);
 
@@ -105 +105 @@
         if(isfile("/proc/cpu_frequ/pll1_fdma_bypass") == 0)
         {
-                debug(10, "[screenaafpanel_settings_overclock] file not found%s", "/proc/cpu_frequ/pll1_fdma_bypass");
+                debug(10, "[screenpanel_settings_overclock] file not found%s", "/proc/cpu_frequ/pll1_fdma_bypass");
                 return;
         }
@@ -111 +111 @@
         if(ostrcmp(newfdma, inifdma) == 0 && ostrcmp(newfdma, oldfdma) == 0)
         {
-                debug(10, "[screenaafpanel_settings_overclock] Nothing to change in FDMA");
+                debug(10, "[screenpanel_settings_overclock] Nothing to change in FDMA");
                 return;
         }
@@ -121 +121 @@
         tmpstr = ostrcat(tmpstr, "\" > /proc/cpu_frequ/pll1_fdma_bypass", 1, 0);
 
-        debug(10, "[screenaafpanel_settings_overclock] Set FDMA to %s", newfdma);
+        debug(10, "[screenpanel_settings_overclock] Set FDMA to %s", newfdma);
         system(tmpstr);
 
@@ -156 +156 @@
 }
 
-void screenaafpanel_settings_overclocking()
+void screenpanel_settings_overclocking()
 {
         int rcret = 0;
-        struct skin* aaf_overclock = getscreen("aafpanel_settings_overclocking");
-        struct skin* listbox = getscreennode(aaf_overclock, "listbox");
-        struct skin* label1 = getscreennode(aaf_overclock, "label1");
+        struct skin* panel_overclock = getscreen("panel_settings_overclocking");
+        struct skin* listbox = getscreennode(panel_overclock, "listbox");
+        struct skin* label1 = getscreennode(panel_overclock, "label1");
         struct skin* node = NULL;
         struct skin* tmp = NULL;
@@ -170 +170 @@
         char* inifdma = NULL, *oldfdma = NULL;
 
-        addscreenrc(aaf_overclock, listbox);
+        addscreenrc(panel_overclock, listbox);
 
         if(checkbox("UFS912") || checkbox("AT7500") || checkbox("SPARK"))
@@ -187 +187 @@
         }
 
-        node = addlistbox(aaf_overclock, listbox, node, 1);
+        node = addlistbox(panel_overclock, listbox, node, 1);
         if(node != NULL)
         {
@@ -196 +196 @@
         }
 
-        node = addlistbox(aaf_overclock, listbox, node, 1);
+        node = addlistbox(panel_overclock, listbox, node, 1);
         if(node != NULL)
         {
@@ -207 +207 @@
         if(checkbox("UFS912") == 0 && checkbox("AT7500") == 0 && checkbox("SPARK") == 0)
         {
-                node = addlistbox(aaf_overclock, listbox, node, 1);
+                node = addlistbox(panel_overclock, listbox, node, 1);
                 if(node != NULL)
                 {
@@ -217 +217 @@
         }
 
-        node = addlistbox(aaf_overclock, listbox, node, 1);
+        node = addlistbox(panel_overclock, listbox, node, 1);
         if(node != NULL)
         {
@@ -227 +227 @@
                 if(ostrcmp(getownconfig(node->name), "1") == 0)
                 {
-                        node = addlistbox(aaf_overclock, listbox, node, 1);
+                        node = addlistbox(panel_overclock, listbox, node, 1);
                         if(node != NULL)
                         {
@@ -238 +238 @@
                 else
                 {
-                        node = addlistbox(aaf_overclock, listbox, node, 1);
+                        node = addlistbox(panel_overclock, listbox, node, 1);
                         if(node != NULL)
                         {
@@ -249 +249 @@
         if(checkbox("UFS912") == 0 && checkbox("AT7500") == 0 && checkbox("SPARK") == 0)
         {
-                node = addlistbox(aaf_overclock, listbox, node, 1);
+                node = addlistbox(panel_overclock, listbox, node, 1);
                 if(node != NULL)
                 {
@@ -260 +260 @@
 
         read_cpufreq(label1);
-        drawscreen(aaf_overclock, 0);
+        drawscreen(panel_overclock, 0);
 
         inifreq = getlistvalue(listbox,"pll0_ndiv_mdiv");
@@ -271 +271 @@
         while(1)
         {
-                addscreenrc(aaf_overclock, tmp);
-                rcret = waitrc(aaf_overclock, 0, 0);
+                addscreenrc(panel_overclock, tmp);
+                rcret = waitrc(panel_overclock, 0, 0);
                 tmp = listbox->select;
 
@@ -285 +285 @@
                         set_fdma(oldfdma, oldfdma, getownconfig("pll1_fdma_bypass"));
                         read_cpufreq(label1);
-                        drawscreen(aaf_overclock, 0);
+                        drawscreen(panel_overclock, 0);
                 }
 
@@ -306 +306 @@
                                         changeinput(listbox->select, NULL);
                                 }
-                                drawscreen(aaf_overclock, 0);
+                                drawscreen(panel_overclock, 0);
                         }
                 }
@@ -322 +322 @@
         inifreq = NULL; oldfreq = NULL; inifdma = NULL; oldfdma = NULL;
         delownconfigtmpall();
-        delmarkedscreennodes(aaf_overclock, 1);
-        delownerrc(aaf_overclock);
-        clearscreen(aaf_overclock);
+        delmarkedscreennodes(panel_overclock, 1);
+        delownerrc(panel_overclock);
+        clearscreen(panel_overclock);
 }
 

titan/plugins/panel/panel_settings_redbutton.h

@@ -1 @@
-#ifndef AAFPANEL_SETTINGS_REDBUTTON_H
-#define AAFPANEL_SETTINGS_REDBUTTON_H
+#ifndef PANEL_SETTINGS_REDBUTTON_H
+#define PANEL_SETTINGS_REDBUTTON_H
 
-void screenaafpanel_settings_redbutton()
+void screenpanel_settings_redbutton()
 {
         debug(1000, "in");

titan/plugins/panel/panel_softcam.h

@@ -1 @@
-#ifndef AAFPANEL_SOFTCAM_H
-#define AAFPANEL_SOFTCAM_H
+#ifndef PANEL_SOFTCAM_H
+#define PANEL_SOFTCAM_H
 
 char* swhichcam = NULL;
@@ -109 +109 @@
 {
         struct clist* elist = NULL;
-        struct skin* screen = getscreen("aafpanel_softcam");
+        struct skin* screen = getscreen("panel_softcam");
         struct skin* listbox = getscreennode(screen, "listbox");
         struct skin* node = NULL;
@@ -225 +225 @@
 }
 
-void screenaafpanel_softcam()
+void screenpanel_softcam()
 {
         int rcret = 0;
-        struct skin* aafpanel_softcam = getscreen("aafpanel_softcam");
-        struct skin* listbox = getscreennode(aafpanel_softcam, "listbox");
-        struct skin* labelecminfo = getscreennode(aafpanel_softcam, "ecminfo");
-        struct skin* menutitle = getscreennode(aafpanel_softcam, "menutitle");
-        struct skin* b_red = getscreennode(aafpanel_softcam, "b1");
-        struct skin* b_green = getscreennode(aafpanel_softcam, "b2");
-        struct skin* b_yellow = getscreennode(aafpanel_softcam, "b3");
-        struct skin* b_blue = getscreennode(aafpanel_softcam, "b4");
+        struct skin* panel_softcam = getscreen("panel_softcam");
+        struct skin* listbox = getscreennode(panel_softcam, "listbox");
+        struct skin* labelecminfo = getscreennode(panel_softcam, "ecminfo");
+        struct skin* menutitle = getscreennode(panel_softcam, "menutitle");
+        struct skin* b_red = getscreennode(panel_softcam, "b1");
+        struct skin* b_green = getscreennode(panel_softcam, "b2");
+        struct skin* b_yellow = getscreennode(panel_softcam, "b3");
+        struct skin* b_blue = getscreennode(panel_softcam, "b4");
         struct skin* tmp = NULL;
 
@@ -254 +254 @@
         fillmenubox();
 
-        drawscreen(aafpanel_softcam, 0);
-        addscreenrc(aafpanel_softcam, listbox);
+        drawscreen(panel_softcam, 0);
+        addscreenrc(panel_softcam, listbox);
 
         tmp = listbox->select;
@@ -261 +261 @@
         while(1)
         {
-                addscreenrc(aafpanel_softcam, tmp);
-                rcret = waitrc(aafpanel_softcam, 4000, 0);
+                addscreenrc(panel_softcam, tmp);
+                rcret = waitrc(panel_softcam, 4000, 0);
                 tmp = listbox->select;
 
@@ -269 +269 @@
                         // deactivate emu
                         deactivate(tmp->name);
-                        drawscreen(aafpanel_softcam, 0);
+                        drawscreen(panel_softcam, 0);
                 }
                 if(rcret == getrcconfigint("rcgreen", NULL)){
                         // restart emu
                         restartcam(tmp->name);
-                        drawscreen(aafpanel_softcam, 0);
+                        drawscreen(panel_softcam, 0);
                 }
                 if(rcret == getrcconfigint("rcyellow", NULL)){
@@ -281 +281 @@
                         readmenu();
                         fillmenubox();
-                        drawscreen(aafpanel_softcam, 0);
+                        drawscreen(panel_softcam, 0);
                 }
                 if(rcret == getrcconfigint("rcblue", NULL)){
                         // activate emu
                         activate(tmp->name);
-                        drawscreen(aafpanel_softcam, 0);
+                        drawscreen(panel_softcam, 0);
                 }
                 if(rcret == getrcconfigint("rcok", NULL)){
@@ -296 +296 @@
                                 startcam(tmp->name);
                         }
-                        drawscreen(aafpanel_softcam, 0);
+                        drawscreen(panel_softcam, 0);
                 }
                 if(rcret == RCTIMEOUT){
                         // update ecminfo
                         readecminfo(labelecminfo);
-                        drawscreen(aafpanel_softcam, 0);
+                        drawscreen(panel_softcam, 0);
                 }
         }
@@ -309 +309 @@
 
         free(swhichcam);
-        delmarkedscreennodes(aafpanel_softcam, 1);
-        delownerrc(aafpanel_softcam);
-        clearscreen(aafpanel_softcam);
+        delmarkedscreennodes(panel_softcam, 1);
+        delownerrc(panel_softcam);
+        clearscreen(panel_softcam);
 }
 

titan/plugins/panel/panel_system.h

@@ -1 @@
-#ifndef AAFPANEL_SYSTEM_H
-#define AAFPANEL_SYSTEM_H
-
-void screenaafpanel_system_update(int mode)
+#ifndef PANEL_SYSTEM_H
+#define PANEL_SYSTEM_H
+
+void screenpanel_system_update(int mode)
 {
         debug(50, "(start) mode=%d", mode);
@@ -8 +8 @@
 
         status.hangtime = 99999;
-        struct skin* aafpanel_system = getscreen("aafpanel_system_main");
-        drawscreen(aafpanel_system, 0);
+        struct skin* panel_system = getscreen("panel_system_main");
+        drawscreen(panel_system, 0);
 
         char* tmpstr = NULL;
@@ -21 +21 @@
         if (mode == 0){
                 system("/sbin/update.sh getfilelist");
-                skinname = "aafpanel_system_update_flash_online_menu";
+                skinname = "panel_system_update_flash_online_menu";
                 filemask = ostrcat(filemask, "*.img", 1, 0);
                 filepath = ostrcat(filepath, "/tmp/online", 1, 0);
                 type = ostrcat(type, "online", 1, 0);
         } else if (mode == 1){
-                skinname = "aafpanel_system_update_flash_tmp_menu";
+                skinname = "panel_system_update_flash_tmp_menu";
                 filemask = ostrcat(filemask, "*.img", 1, 0);
                 filepath = ostrcat(filepath, "/tmp", 1, 0);
@@ -32 +32 @@
         } else if (mode == 2){
                 system("/sbin/update.sh getfilelist");
-                skinname = "aafpanel_system_update_usb_online_menu";
+                skinname = "panel_system_update_usb_online_menu";
                 filemask = ostrcat(filemask, "*.tar.gz", 1, 0);
                 filepath = ostrcat(filepath, "/tmp/online", 1, 0);
                 type = ostrcat(type, "online", 1, 0);
         } else if (mode == 3){
-                skinname = "aafpanel_system_update_usb_tmp_menu";
+                skinname = "panel_system_update_usb_tmp_menu";
                 filemask = ostrcat(filemask, "*.tar.gz", 1, 0);
                 filepath = ostrcat(filepath, "/tmp", 1, 0);
@@ -43 +43 @@
         }
 
-        aafpanel_system = getscreen(skinname);
-        struct skin* filelistpath = getscreennode(aafpanel_system, "aafpanel_filelistpath");
-        struct skin* filelist = getscreennode(aafpanel_system, "aafpanel_filelist");
-
-        struct skin* device = getscreennode(aafpanel_system, "device");
+        panel_system = getscreen(skinname);
+        struct skin* filelistpath = getscreennode(panel_system, "panel_filelistpath");
+        struct skin* filelist = getscreennode(panel_system, "panel_filelist");
+
+        struct skin* device = getscreennode(panel_system, "device");
 
         if (mode == 2 || mode == 3){
@@ -109 +109 @@
         setchoiceboxselection(device, getconfig("device", NULL));
 
-        getfilelist(aafpanel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
-        addscreenrc(aafpanel_system, filelist);
+        getfilelist(panel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
+        addscreenrc(panel_system, filelist);
         if(mode == 2 || mode == 3)
         {
-                delrc(getrcconfigint("rcright", NULL), aafpanel_system, filelist);
-                delrc(getrcconfigint("rcleft", NULL), aafpanel_system, filelist);
-                addscreenrc(aafpanel_system, device);
+                delrc(getrcconfigint("rcright", NULL), panel_system, filelist);
+                delrc(getrcconfigint("rcleft", NULL), panel_system, filelist);
+                addscreenrc(panel_system, device);
         }
 
         while(1)
         {
-                rcret = waitrc(aafpanel_system, 0, 0);
-                debug(40, "[aafpanel_system] while status");
+                rcret = waitrc(panel_system, 0, 0);
+                debug(40, "[panel_system] while status");
 
 
@@ -130 +130 @@
                                 system("/sbin/update.sh getfilelist");
                         }
-                        drawscreen(aafpanel_system, 0);
-                        getfilelist(aafpanel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
-                        addscreenrc(aafpanel_system, filelist);
+                        drawscreen(panel_system, 0);
+                        getfilelist(panel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
+                        addscreenrc(panel_system, filelist);
                         continue;
                 } else if(rcret == getrcconfigint("rcok", NULL) || rcret == getrcconfigint("rcgreen", NULL)){
@@ -139 +139 @@
                         } else if(filelist->select != NULL && filelist->select->input == NULL){
                                 tmpstr = createpath(filelistpath->text, filelist->select->text);
-                                debug(40, "[aafpanel_system] tmpstr: %s", tmpstr);
+                                debug(40, "[panel_system] tmpstr: %s", tmpstr);
 
                                 char* cmd = NULL;
@@ -149 +149 @@
 
                                 if(file_exist("/tmp/.swapextensionsdev")){
-                                        printf("[AafPanel] Update: update with log\n");
+                                        printf("[Panel] Update: update with log\n");
                                         if(string_find("_KERNEL_",filelist->select->text)){
                                                 cmd = ostrcat(cmd, "kernel ", 1, 0);
@@ -191 +191 @@
                                         }
                                 } else {
-                                        printf("[AafPanel] Update: update without log\n");
+                                        printf("[Panel] Update: update without log\n");
 
                                         if(string_find("_KERNEL_",filelist->select->text)){
@@ -227 +227 @@
                                         }
                                 }
-                                clearscreen(aafpanel_system);
+                                clearscreen(panel_system);
                                 if(msgtxt == NULL){
                                         textbox(_("Message"), _("Error file not supported"), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                                        drawscreen(aafpanel_system, 0);
-                                        getfilelist(aafpanel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
-                                        addscreenrc(aafpanel_system, filelist);
+                                        drawscreen(panel_system, 0);
+                                        getfilelist(panel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
+                                        addscreenrc(panel_system, filelist);
                                         continue;
                                 }
 
                                 if(textbox(_("Message"), _(msgtxt), _("EXIT"), getrcconfigint("rcexit", NULL), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 2){
-                                        debug(40, "[aafpanel_system] update started cmd: %s", cmd);
+                                        debug(40, "[panel_system] update started cmd: %s", cmd);
                                         system(cmd);
                                 } else {
-                                        debug(40, "[aafpanel_system] update canceled cmd: %s", cmd);
-                                        drawscreen(aafpanel_system, 0);
-                                        getfilelist(aafpanel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
-                                        addscreenrc(aafpanel_system, filelist);
+                                        debug(40, "[panel_system] update canceled cmd: %s", cmd);
+                                        drawscreen(panel_system, 0);
+                                        getfilelist(panel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
+                                        addscreenrc(panel_system, filelist);
                                         continue;
                                 }
@@ -254 +254 @@
                 }
         }
-        delownerrc(aafpanel_system);
-        clearscreen(aafpanel_system);
-
-        delownerrc(aafpanel_system);
-        clearscreen(aafpanel_system);
+        delownerrc(panel_system);
+        clearscreen(panel_system);
+
+        delownerrc(panel_system);
+        clearscreen(panel_system);
 
         status.hangtime = getconfigint("hangtime", NULL);
-        debug(40, "[screenaafpanel_system_update] closed:");
+        debug(40, "[screenpanel_system_update] closed:");
 }
 

titan/plugins/panel/panel_system_backup.h

@@ -1 @@
-#ifndef AAFPANEL_SYSTEM_BACKUP_H
-#define AAFPANEL_SYSTEM_BACKUP_H
+#ifndef PANEL_SYSTEM_BACKUP_H
+#define PANEL_SYSTEM_BACKUP_H
 
-void screenaafpanel_system_backup()
+void screenpanel_system_backup()
 {
         int rcret = 0;
-        struct skin* aaf_backup = getscreen("aafpanel_system_backup");
-        struct skin* listbox = getscreennode(aaf_backup, "listbox");
-        struct skin *listfield = getscreennode(aaf_backup, "listfield");
-        struct skin* b_red = getscreennode(aaf_backup, "b1");
-        struct skin* b_green = getscreennode(aaf_backup, "b2");
-        struct skin* info = getscreennode(aaf_backup, "info");
+        struct skin* panel_backup = getscreen("panel_system_backup");
+        struct skin* listbox = getscreennode(panel_backup, "listbox");
+        struct skin *listfield = getscreennode(panel_backup, "listfield");
+        struct skin* b_red = getscreennode(panel_backup, "b1");
+        struct skin* b_green = getscreennode(panel_backup, "b2");
+        struct skin* info = getscreennode(panel_backup, "info");
         struct skin* tmp = NULL;
         char* tmpstr = NULL, *infotext = NULL;
@@ -21 +21 @@
         b_red->hidden = NO; b_green->hidden = NO;
 
-        changetitle(aaf_backup, _("Create Backup"));
+        changetitle(panel_backup, _("Create Backup"));
 
-        addscreenrc(aaf_backup, listbox);
+        addscreenrc(panel_backup, listbox);
 
         if(checkbox("UFS912") || checkbox("AT7500"))
@@ -34 +34 @@
         }
 
-        drawscreen(aaf_backup, 0);
+        drawscreen(panel_backup, 0);
         tmp = listbox->select;
 
         while(1)
         {
-                addscreenrc(aaf_backup, tmp);
-                rcret = waitrc(aaf_backup, 0, 0);
+                addscreenrc(panel_backup, tmp);
+                rcret = waitrc(panel_backup, 0, 0);
                 tmp = listbox->select;
 
@@ -56 +56 @@
                         {
                                 b_red->hidden = YES; b_green->hidden = YES;
-                                drawscreen(aaf_backup, 0);
+                                drawscreen(panel_backup, 0);
                                 tmpstr = ostrcat(tmpstr, "backup.sh ", 1, 0);
                                 tmpstr = ostrcat(tmpstr, getownconfig(listbox->select->name), 1, 0);
@@ -67 +67 @@
 
         infotext = NULL;
-        delownerrc(aaf_backup);
-        clearscreen(aaf_backup);
+        delownerrc(panel_backup);
+        clearscreen(panel_backup);
 }
 

titan/plugins/panel/panel_system_restore.h

@@ -1 @@
-#ifndef AAFPANEL_SYSTEM_RESTORE_H
-#define AAFPANEL_SYSTEM_RESTORE_H
+#ifndef PANEL_SYSTEM_RESTORE_H
+#define PANEL_SYSTEM_RESTORE_H
 
-void screenaafpanel_system_restore()
+void screenpanel_system_restore()
 {
         int rcret = 0;
-        struct skin* aaf_restore = getscreen("aafpanel_system_restore");
-        struct skin* b_red = getscreennode(aaf_restore, "b1");
-        struct skin* b_green = getscreennode(aaf_restore, "b2");
-        struct skin* b_yellow = getscreennode(aaf_restore, "b3");
-        struct skin* info = getscreennode(aaf_restore, "info");
+        struct skin* panel_restore = getscreen("panel_system_restore");
+        struct skin* b_red = getscreennode(panel_restore, "b1");
+        struct skin* b_green = getscreennode(panel_restore, "b2");
+        struct skin* b_yellow = getscreennode(panel_restore, "b3");
+        struct skin* info = getscreennode(panel_restore, "info");
         char* tmpstr = NULL, *infotext = NULL;
 
-        infotext = "Press -restore- and your saved settings will be restored from your swapstick / recording hdd! The Box will restart automatically for restoring!\n\nPress -backup- to save your actual settings to swapstick / recording hdd.\nWARNING: The old backup will be deleted!\n\nWhile using the update function of the AAF Panel, your settings will be saved and restored automatically, if possible!";
+        infotext = "Press -restore- and your saved settings will be restored from your swapstick / recording hdd! The Box will restart automatically for restoring!\n\nPress -backup- to save your actual settings to swapstick / recording hdd.\nWARNING: The old backup will be deleted!\n\nWhile using the update function of the Panel, your settings will be saved and restored automatically, if possible!";
 
         changetext(info, _(infotext));
-        changetitle(aaf_restore, _("Backup / Restore Settings"));
+        changetitle(panel_restore, _("Backup / Restore Settings"));
 
-        drawscreen(aaf_restore, 0);
+        drawscreen(panel_restore, 0);
 
         while(1)
         {
-                rcret = waitrc(aaf_restore, 0, 0);
+                rcret = waitrc(panel_restore, 0, 0);
 
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
@@ -28 +28 @@
                 if(rcret == getrcconfigint("rcgreen", NULL))
                 {
-                        clearscreen(aaf_restore);
+                        clearscreen(panel_restore);
                         if(textbox(_("Restore Settings"), _("Are you sure you want to restore settings?\n\nOK = start restore\nEXIT = abort restore\n\n"), _("EXIT"), getrcconfigint("rcexit", NULL), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, 700, 250, 0, 0) == 2)
                         {
@@ -44 +44 @@
                                 else
                                 {
-                                        //clearscreen(aaf_restore);
+                                        //clearscreen(panel_restore);
                                         textbox(_("RESTORE ERROR"), _("No backup folders found!!!\n\nAborting restoring..."), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                                        drawscreen(aaf_restore, 0);
+                                        drawscreen(panel_restore, 0);
                                 }
                         }else
                         {
-                                drawscreen(aaf_restore, 0);
+                                drawscreen(panel_restore, 0);
                         }
                 }
@@ -57 +57 @@
                         if(isfile("/tmp/.backupdev"))
                         {
-                                changetitle(aaf_restore, _("Backup - Settings"));
+                                changetitle(panel_restore, _("Backup - Settings"));
                                 changetext(info, _("Backup started\n\nPlease wait..."));
                                 info->textposx = 50;
                                 b_red->hidden = YES; b_green->hidden = YES; b_yellow->hidden = YES;
-                                drawscreen(aaf_restore, 0);
+                                drawscreen(panel_restore, 0);
 
                                 writeallconfig(1);
@@ -67 +67 @@
                                 free(tmpstr); tmpstr = NULL;
 
-                                changetitle(aaf_restore, _("Backup / Restore Settings"));
+                                changetitle(panel_restore, _("Backup / Restore Settings"));
                                 changetext(info, _(infotext));
                                 info->textposx = 0;
                                 b_red->hidden = NO; b_green->hidden = NO; b_yellow->hidden = NO;
-                                drawscreen(aaf_restore, 0);
+                                drawscreen(panel_restore, 0);
                         }
                         else
                         {
-                                clearscreen(aaf_restore);
+                                clearscreen(panel_restore);
                                 textbox(_("BACKUP ERROR"), _("A record hdd or a swapstick must be mounted!\n\nAborting backup..."), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                                drawscreen(aaf_restore, 0);
+                                drawscreen(panel_restore, 0);
                         }
                 }
@@ -83 +83 @@
 
         infotext = NULL;
-        delownerrc(aaf_restore);
-        clearscreen(aaf_restore);
+        delownerrc(panel_restore);
+        clearscreen(panel_restore);
 }
 #endif