Changeset 11419


Ignore:
Timestamp:
Nov 20, 2011, 4:49:55 PM (9 years ago)
Author:
nit
Message:

[titan] del AAF text

Location:
titan/plugins/panel
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • titan/plugins/panel/panel.c

    r11346 r11419  
    22#include "../titan/debug.h"
    33#include "../titan/header.h"
    4 #include "aafpanel_header.h"
    5 #include "aafpanel_global.h"
    6 #include "aafpanel_softcam.h"
    7 #include "aafpanel_settings.h"
    8 #include "aafpanel_system.h"
    9 #include "aafpanel_extensions.h"
    10 #include "aafpanel_infos.h"
    11 #include "aafpanel_infos_sysinfo.h"
    12 #include "aafpanel_settings_bluebutton.h"
    13 #include "aafpanel_settings_redbutton.h"
    14 #include "aafpanel_settings_autostart.h"
    15 #include "aafpanel_settings_overclocking.h"
    16 #include "aafpanel_settings_fancontrol.h"
    17 #include "aafpanel_system_restore.h"
    18 #include "aafpanel_system_backup.h"
    19 #include "aafpanel_ipk.h"
    20 #include "aafpanel_main.h"
     4#include "panel_header.h"
     5#include "panel_global.h"
     6#include "panel_softcam.h"
     7#include "panel_settings.h"
     8#include "panel_system.h"
     9#include "panel_extensions.h"
     10#include "panel_infos.h"
     11#include "panel_infos_sysinfo.h"
     12#include "panel_settings_bluebutton.h"
     13#include "panel_settings_redbutton.h"
     14#include "panel_settings_autostart.h"
     15#include "panel_settings_overclocking.h"
     16#include "panel_settings_fancontrol.h"
     17#include "panel_system_restore.h"
     18#include "panel_system_backup.h"
     19#include "panel_ipk.h"
     20#include "panel_main.h"
    2121
    2222char pluginname[] = "Panel";
     
    6363void start(void)
    6464{
    65         aafpanel_main();
     65        panel_main();
    6666}
  • titan/plugins/panel/panel_extensions.h

    r11416 r11419  
    1 #ifndef AAFPANEL_EXTENSIONS_H
    2 #define AAFPANEL_EXTENSIONS_H
     1#ifndef PANEL_EXTENSIONS_H
     2#define PANEL_EXTENSIONS_H
    33
    44
    5 void screenaafpanel_extensions(int mode)
     5void screenpanel_extensions(int mode)
    66{
    77        char* section = NULL;
     
    1414                tmpstr = get_ipk_section();
    1515                free(section); section = NULL;
    16 //              char* section = ostrcat(section, ipklistbox(NULL, tmpstr, NULL, "Ipk Install - select section", "%pluginpath%/aafpanel/skin/", 1), 1, 1);
    17                 section = ipklistbox(NULL, tmpstr, NULL, "Ipk Install - select section", "%pluginpath%/aafpanel/skin/", 1);
     16//              char* section = ostrcat(section, ipklistbox(NULL, tmpstr, NULL, "Ipk Install - select section", "%pluginpath%/panel/skin/", 1), 1, 1);
     17                section = ipklistbox(NULL, tmpstr, NULL, "Ipk Install - select section", "%pluginpath%/panel/skin/", 1);
    1818                free(tmpstr); tmpstr = NULL;
    1919
     
    4444                        free(file); file = NULL;
    4545                        free(tmpstr); tmpstr = NULL;
    46                         screenaafpanel_extensions(0);
     46                        screenpanel_extensions(0);
    4747                }
    4848        }
     
    5151                tmpstr = get_ipk_listinstall();
    5252                free(file); file = NULL;
    53 //              file = ostrcat(file, ipklistbox(NULL, tmpstr, NULL, "Ipk Remove - select file", "%pluginpath%/aafpanel/skin/", 1), 1, 1);
    54                 file = ipklistbox(NULL, tmpstr, NULL, "Ipk Remove - select file", "%pluginpath%/aafpanel/skin/", 1);
     53//              file = ostrcat(file, ipklistbox(NULL, tmpstr, NULL, "Ipk Remove - select file", "%pluginpath%/panel/skin/", 1), 1, 1);
     54                file = ipklistbox(NULL, tmpstr, NULL, "Ipk Remove - select file", "%pluginpath%/panel/skin/", 1);
    5555                free(tmpstr); tmpstr = NULL;
    5656                debug(60, "file: %s", file);
     
    6767                        free(tmpinfo); tmpinfo = NULL;
    6868                        free(file); file = NULL;
    69                         screenaafpanel_extensions(1);
     69                        screenpanel_extensions(1);
    7070                }
    7171                free(file); file = NULL;
  • titan/plugins/panel/panel_global.h

    r11416 r11419  
    1 #ifndef AAFPANEL_GLOBAL_H
    2 #define AAFPANEL_GLOBAL_H
     1#ifndef PANEL_GLOBAL_H
     2#define PANEL_GLOBAL_H
    33
    44#define MAXTOKENS       256
  • titan/plugins/panel/panel_header.h

    r11416 r11419  
    1 #ifndef AAFPANEL_HEADER_H
    2 #define AAFPANEL_HEADER_H
     1#ifndef PANEL_HEADER_H
     2#define PANEL_HEADER_H
    33
    4 // aafpanel_ipk.h
     4// panel_ipk.h
    55char* ipklistbox(char* defaultstr, char* str, char* skinname, char* skintitle, char* skinpath, int showpng);
    66
    77void screenplugin();
    88
    9 // aafpanel_main.h
    10 int aafpanel_menucall(struct skin* aafpanel_menuentry);
     9// panel_main.h
     10int panel_menucall(struct skin* panel_menuentry);
    1111
    1212#endif
  • titan/plugins/panel/panel_infos.h

    r11416 r11419  
    1 #ifndef AAFPANEL_INFOS_H
    2 #define AAFPANEL_INFOS_H
     1#ifndef PANEL_INFOS_H
     2#define PANEL_INFOS_H
    33
    4 void screenaafpanel_infos(int mode)
     4void screenpanel_infos(int mode)
    55{
    66
    77        char* tmpstr = NULL;
    88        int rcret = 0;
    9         struct skin* aaf_info = getscreen("aafpanel_infos");
    10         struct skin* info = getscreennode(aaf_info, "info");
     9        struct skin* panel_info = getscreen("panel_infos");
     10        struct skin* info = getscreennode(panel_info, "info");
    1111
    12         addscreenrc(aaf_info, info);
     12        addscreenrc(panel_info, info);
    1313
    1414        if (mode == 0){
    1515                char* tmpstr1 = NULL, *tmpstr2 = NULL, *tmpstr3 = NULL;
    1616
    17                 changetitle(aaf_info, _("AAF Infos"));
     17                changetitle(panel_info, _("Infos"));
    1818
    1919                tmpstr1 = command("cat /etc/motd");
     
    3333                char* tmpstr1 = NULL, *tmpstr2 = NULL;
    3434
    35                 changetitle(aaf_info, _("AAF Default"));
     35                changetitle(panel_info, _("Default"));
    3636
    3737                tmpstr1 = ostrcat("Date = ", "", 0, 0);
     
    6464
    6565        if (mode == 2){
    66                 changetitle(aaf_info, _("AAF Free Space"));
     66                changetitle(panel_info, _("Free Space"));
    6767
    6868                tmpstr = command("df -h");
     
    7373
    7474        if (mode == 3){
    75                 changetitle(aaf_info, _("AAF Kernel"));
     75                changetitle(panel_info, _("Kernel"));
    7676
    7777                tmpstr = command("cat /proc/version");
     
    8282
    8383        if (mode == 4){
    84                 changetitle(aaf_info, _("AAF Mounts"));
     84                changetitle(panel_info, _("Mounts"));
    8585
    8686                tmpstr = command("mount");
     
    9393                char* tmpstr1 = NULL, *tmpstr2 = NULL;
    9494
    95                 changetitle(aaf_info, _("AAF Network"));
     95                changetitle(panel_info, _("Network"));
    9696
    9797                tmpstr = command("ifconfig");
     
    104104
    105105        if (mode == 6){
    106                 changetitle(aaf_info, _("AAF Ram"));
     106                changetitle(panel_info, _("Ram"));
    107107
    108108                tmpstr = command("free");
     
    112112        }
    113113
    114         drawscreen(aaf_info, 0);
     114        drawscreen(panel_info, 0);
    115115
    116116        while(1)
    117117        {
    118                 rcret = waitrc(aaf_info, 0, 0);
     118                rcret = waitrc(panel_info, 0, 0);
    119119
    120120                if(rcret == getrcconfigint("rcexit", NULL)) break;
     
    122122        }
    123123
    124         delownerrc(aaf_info);
    125         clearscreen(aaf_info);
    126         //delscreen(aaf_info);
     124        delownerrc(panel_info);
     125        clearscreen(panel_info);
     126        //delscreen(panel_info);
    127127}
    128128
  • titan/plugins/panel/panel_infos_sysinfo.h

    r11416 r11419  
    1 #ifndef AAFPANEL_INFOS_SYSINFO_H
    2 #define AAFPANEL_INFOS_SYSINFO_H
     1#ifndef PANEL_INFOS_SYSINFO_H
     2#define PANEL_INFOS_SYSINFO_H
    33
    4 void screenaafpanel_infos_sysinfo(int mode)
     4void screenpanel_infos_sysinfo(int mode)
    55{
    66
    77        char* tmpstr = NULL;
    88        int rcret = 0;
    9         struct skin* aaf_info = getscreen("aafpanel_infos");
    10         struct skin* info = getscreennode(aaf_info, "info");
     9        struct skin* panel_info = getscreen("panel_infos");
     10        struct skin* info = getscreennode(panel_info, "info");
    1111
    12         addscreenrc(aaf_info, info);
     12        addscreenrc(panel_info, info);
    1313
    1414        if (mode == 0){
    15                 changetitle(aaf_info, _("AAF CPU info"));
     15                changetitle(panel_info, _("CPU info"));
    1616
    1717                tmpstr = command("cat /proc/cpuinfo | sed 's/\t\t/\t/'");
     
    2222
    2323        if (mode == 1){
    24                 changetitle(aaf_info, _("AAF Memory info"));
     24                changetitle(panel_info, _("Memory info"));
    2525
    2626                tmpstr = command("cat /proc/meminfo");
     
    3131
    3232        if (mode == 2){
    33                 changetitle(aaf_info, _("AAF MTD info"));
     33                changetitle(panel_info, _("MTD info"));
    3434
    3535                tmpstr = command("cat /proc/mtd");
     
    4040
    4141        if (mode == 3){
    42                 changetitle(aaf_info, _("AAF Module info"));
     42                changetitle(panel_info, _("Module info"));
    4343
    4444                tmpstr = command("cat /proc/modules");
     
    4949
    5050        if (mode == 4){
    51                 changetitle(aaf_info, _("AAF Devices"));
     51                changetitle(panel_info, _("Devices"));
    5252
    5353                tmpstr = command("cat /proc/devices");
     
    6262                char* swap[] = {"Name: ", "Type: ", "Size: ", "Used: ", "Prio: "};
    6363
    64                 changetitle(aaf_info, _("AAF Swap info"));
     64                changetitle(panel_info, _("Swap info"));
    6565
    6666                tmpstr1 = command("cat /proc/swaps | sed 's/\t/ /g; s/[ ]* / /g'");
     
    9999
    100100        if (mode == 6){
    101                 changetitle(aaf_info, _("AAF Top info"));
     101                changetitle(panel_info, _("Top info"));
    102102
    103103                //tmpstr = command("top -b -n1");
     
    108108        }
    109109
    110         drawscreen(aaf_info, 0);
     110        drawscreen(panel_info, 0);
    111111
    112112        while(1)
    113113        {
    114                 rcret = waitrc(aaf_info, 0, 0);
     114                rcret = waitrc(panel_info, 0, 0);
    115115
    116116                if(rcret == getrcconfigint("rcexit", NULL)) break;
     
    118118        }
    119119
    120         delownerrc(aaf_info);
    121         clearscreen(aaf_info);
    122         //delscreen(aaf_info);
     120        delownerrc(panel_info);
     121        clearscreen(panel_info);
     122        //delscreen(panel_info);
    123123}
    124124
  • titan/plugins/panel/panel_ipk.h

    r11416 r11419  
    1 #ifndef AAFPANEL_IPK_H
    2 #define AAFPANEL_IPK_H
     1#ifndef PANEL_IPK_H
     2#define PANEL_IPK_H
    33
    44// showpng = 0 (no icon)
     
    187187                                                tmpstr6 = ostrcat("", skinpath1, 0, 0);
    188188                                                ret6 = strsplit(tmpstr6, "%", &count6);
    189                                                 defaultdir = ostrcat(getconfig("skinpath", NULL), "/skin/aafpanel_", 0, 0);
     189                                                defaultdir = ostrcat(getconfig("skinpath", NULL), "/skin/panel_", 0, 0);
    190190                                                defaultdir = ostrcat(defaultdir, (&ret1[i])->part, 1, 0);
    191191                                                defaultdir = ostrcat(defaultdir, ".png", 1, 0);
     
    194194                                                {
    195195                                                        defaultdir = ostrcat(getconfig("pluginpath", NULL), (&ret6[1])->part, 0, 0);
    196                                                         defaultdir = ostrcat(defaultdir, "aafpanel_", 0, 0);
     196                                                        defaultdir = ostrcat(defaultdir, "panel_", 0, 0);
    197197                                                        defaultdir = ostrcat(defaultdir, (&ret1[i])->part, 1, 0);
    198198                                                        defaultdir = ostrcat(defaultdir, ".png", 1, 0);
     
    201201                                        } else {
    202202                                                defaultdir = ostrcat(getconfig("skinpath", NULL), skinpath1, 0, 0);
    203                                                 defaultdir = ostrcat(defaultdir, "/skin/aafpanel_", 0, 0);
     203                                                defaultdir = ostrcat(defaultdir, "/skin/panel_", 0, 0);
    204204                                                defaultdir = ostrcat(defaultdir, (&ret1[i])->part, 1, 0);
    205205                                                defaultdir = ostrcat(defaultdir, ".png", 1, 0);
     
    215215                                        else
    216216                                        {
    217                                                 tmpskinpath = ostrcat(skinpath1, "aafpanel_default.png", 0, 0);
     217                                                tmpskinpath = ostrcat(skinpath1, "panel_default.png", 0, 0);
    218218                                                changepic(tmp, tmpskinpath);
    219219                                                free(tmpskinpath); tmpskinpath = NULL;
  • titan/plugins/panel/panel_main.h

    r11416 r11419  
    1 #ifndef AAFPANEL_MAIN_H
    2 #define AAFPANEL_MAIN_H
    3 
    4 struct skin* aafpanel_menu(struct skin* aafpanel_menu)
     1#ifndef PANEL_MAIN_H
     2#define PANEL_MAIN_H
     3
     4struct skin* panel_menu(struct skin* panel_menu)
    55{
    66        debug(1000, "in");
    77        int rcret = 0, ret = 0;
    8         struct skin* listbox = getscreennode(aafpanel_menu, "listbox");
    9 //      struct skin* aafpanel_softcam_menu = getscreen("aafpanel_softcam");
    10 
    11         if(listbox == NULL || aafpanel_menu == NULL)
     8        struct skin* listbox = getscreennode(panel_menu, "listbox");
     9//      struct skin* panel_softcam_menu = getscreen("panel_softcam");
     10
     11        if(listbox == NULL || panel_menu == NULL)
    1212        {
    1313                debug(1000, "out -> NULL detect");
     
    1616
    1717//      if(checkemu() != 1)
    18 //              aafpanel_softcam_menu->hidden == YES;
     18//              panel_softcam_menu->hidden == YES;
    1919//      else
    20 //              aafpanel_softcam_menu->hidden == NO;
    21 
    22         drawscreen(aafpanel_menu, 0);
    23         addscreenrc(aafpanel_menu, listbox);
     20//              panel_softcam_menu->hidden == NO;
     21
     22        drawscreen(panel_menu, 0);
     23        addscreenrc(panel_menu, listbox);
    2424
    2525        while(1)
    2626        {
    27                 rcret = waitrc(aafpanel_menu, 0, 0);
     27                rcret = waitrc(panel_menu, 0, 0);
    2828
    2929                if (rcret == getrcconfigint("rcexit", NULL)) break;
    3030                if(rcret == getrcconfigint("rcok", NULL))
    3131                {
    32                         clearscreen(aafpanel_menu);
    33                         ret = aafpanel_menucall(listbox->select);
     32                        clearscreen(panel_menu);
     33                        ret = panel_menucall(listbox->select);
    3434                        if(ret != 0)
    3535                                textbox(_("Message"), _("Menu not implemented !"), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
    36                         drawscreen(aafpanel_menu, 0);
     36                        drawscreen(panel_menu, 0);
    3737                }
    3838        }
    3939
    40         delownerrc(aafpanel_menu);
    41         clearscreen(aafpanel_menu);
     40        delownerrc(panel_menu);
     41        clearscreen(panel_menu);
    4242        debug(1000, "out");
    4343        return listbox->select;
    4444}
    4545
    46 int aafpanel_menucall(struct skin* aafpanel_menuentry)
     46int panel_menucall(struct skin* panel_menuentry)
    4747{
    4848        debug(1000, "in");
     
    5050        int ret = 0;
    5151
    52         if(aafpanel_menuentry == NULL)
     52        if(panel_menuentry == NULL)
    5353        {
    5454                debug(1000, "out -> NULL detect");
     
    5656        }
    5757
    58         printf("MENU: %s\n", aafpanel_menuentry->name); // must be removed later
     58        printf("MENU: %s\n", panel_menuentry->name);    // must be removed later
    5959
    6060// softcam
    61         if(ostrcmp("aafpanel_softcam", aafpanel_menuentry->name) == 0){
    62                 screenaafpanel_softcam();
     61        if(ostrcmp("panel_softcam", panel_menuentry->name) == 0){
     62                screenpanel_softcam();
    6363// settings
    64         } else if(ostrcmp("aafpanel_settings", aafpanel_menuentry->name) == 0){
    65                 struct skin* screen = getscreen("aafpanel_settings_main");
     64        } else if(ostrcmp("panel_settings", panel_menuentry->name) == 0){
     65                struct skin* screen = getscreen("panel_settings_main");
    6666
    6767                if(checkbeta() != 1)
    68                         delscreennode(screen, "aafpanel_settings_betacfg");
     68                        delscreennode(screen, "panel_settings_betacfg");
    6969
    7070                if(checkbox("UFS922") != 1)
    71                         delscreennode(screen, "aafpanel_settings_fancontrol");
     71                        delscreennode(screen, "panel_settings_fancontrol");
    7272
    7373                if(isfile("/proc/cpu_frequ/pll0_ndiv_mdiv") != 1)
    74                         delscreennode(screen, "aafpanel_settings_overclocking");
    75 
    76                 aafpanel_menu(screen);
    77 
    78         } else if(ostrcmp("aafpanel_settings_overclocking", aafpanel_menuentry->name) == 0){
    79                 screenaafpanel_settings_overclocking();
    80         } else if(ostrcmp("aafpanel_settings_betacfg", aafpanel_menuentry->name) == 0){
    81                 screenaafpanel_settings(0);
    82         } else if(ostrcmp("aafpanel_settings_automount", aafpanel_menuentry->name) == 0){
    83                 screenaafpanel_settings(1);
    84         } else if(ostrcmp("aafpanel_settings_redbutton", aafpanel_menuentry->name) == 0){
    85                 screenaafpanel_settings_redbutton();
    86         } else if(ostrcmp("aafpanel_settings_bluebutton", aafpanel_menuentry->name) == 0){
    87                 screenaafpanel_settings_bluebutton();
    88         } else if(ostrcmp("aafpanel_settings_autostart", aafpanel_menuentry->name) == 0){
    89                 struct skin* screen = getscreen("aafpanel_autostart_main");
    90                 aafpanel_menu(screen);
    91         } else if(ostrcmp("aafpanel_settings_fancontrol", aafpanel_menuentry->name) == 0){
    92                 screenaafpanel_settings_fancontrol();
     74                        delscreennode(screen, "panel_settings_overclocking");
     75
     76                panel_menu(screen);
     77
     78        } else if(ostrcmp("panel_settings_overclocking", panel_menuentry->name) == 0){
     79                screenpanel_settings_overclocking();
     80        } else if(ostrcmp("panel_settings_betacfg", panel_menuentry->name) == 0){
     81                screenpanel_settings(0);
     82        } else if(ostrcmp("panel_settings_automount", panel_menuentry->name) == 0){
     83                screenpanel_settings(1);
     84        } else if(ostrcmp("panel_settings_redbutton", panel_menuentry->name) == 0){
     85                screenpanel_settings_redbutton();
     86        } else if(ostrcmp("panel_settings_bluebutton", panel_menuentry->name) == 0){
     87                screenpanel_settings_bluebutton();
     88        } else if(ostrcmp("panel_settings_autostart", panel_menuentry->name) == 0){
     89                struct skin* screen = getscreen("panel_autostart_main");
     90                panel_menu(screen);
     91        } else if(ostrcmp("panel_settings_fancontrol", panel_menuentry->name) == 0){
     92                screenpanel_settings_fancontrol();
    9393// system
    94         } else if(ostrcmp("aafpanel_system", aafpanel_menuentry->name) == 0){
    95                 struct skin* screen = getscreen("aafpanel_system_main");
    96                 aafpanel_menu(screen);
    97         } else if(ostrcmp("aafpanel_system_restore", aafpanel_menuentry->name) == 0){
    98                 screenaafpanel_system_restore();
    99         } else if(ostrcmp("aafpanel_system_backup", aafpanel_menuentry->name) == 0){
    100                 screenaafpanel_system_backup();
    101         } else if(ostrcmp("aafpanel_system_imageinfo", aafpanel_menuentry->name) == 0){
    102                 screenaafpanel_infos(0);
    103         } else if(ostrcmp("aafpanel_system_update_flash_online", aafpanel_menuentry->name) == 0){
    104                 screenaafpanel_system_update(0);
    105         } else if(ostrcmp("aafpanel_system_update_flash_tmp", aafpanel_menuentry->name) == 0){
    106                 screenaafpanel_system_update(1);
    107         } else if(ostrcmp("aafpanel_system_update_usb_online", aafpanel_menuentry->name) == 0){
    108                 screenaafpanel_system_update(2);
    109         } else if(ostrcmp("aafpanel_system_update_usb_tmp", aafpanel_menuentry->name) == 0){
    110                 screenaafpanel_system_update(3);
     94        } else if(ostrcmp("panel_system", panel_menuentry->name) == 0){
     95                struct skin* screen = getscreen("panel_system_main");
     96                panel_menu(screen);
     97        } else if(ostrcmp("panel_system_restore", panel_menuentry->name) == 0){
     98                screenpanel_system_restore();
     99        } else if(ostrcmp("panel_system_backup", panel_menuentry->name) == 0){
     100                screenpanel_system_backup();
     101        } else if(ostrcmp("panel_system_imageinfo", panel_menuentry->name) == 0){
     102                screenpanel_infos(0);
     103        } else if(ostrcmp("panel_system_update_flash_online", panel_menuentry->name) == 0){
     104                screenpanel_system_update(0);
     105        } else if(ostrcmp("panel_system_update_flash_tmp", panel_menuentry->name) == 0){
     106                screenpanel_system_update(1);
     107        } else if(ostrcmp("panel_system_update_usb_online", panel_menuentry->name) == 0){
     108                screenpanel_system_update(2);
     109        } else if(ostrcmp("panel_system_update_usb_tmp", panel_menuentry->name) == 0){
     110                screenpanel_system_update(3);
    111111// extensions
    112         } else if(ostrcmp("aafpanel_extensions", aafpanel_menuentry->name) == 0){
    113                 struct skin* screen = getscreen("aafpanel_extensions_main");
    114                 aafpanel_menu(screen);
    115         } else if(ostrcmp("aafpanel_extensions_menu", aafpanel_menuentry->name) == 0){
     112        } else if(ostrcmp("panel_extensions", panel_menuentry->name) == 0){
     113                struct skin* screen = getscreen("panel_extensions_main");
     114                panel_menu(screen);
     115        } else if(ostrcmp("panel_extensions_menu", panel_menuentry->name) == 0){
    116116                screenplugin();
    117         } else if(ostrcmp("aafpanel_extensions_ipkinstall", aafpanel_menuentry->name) == 0){
    118                 screenaafpanel_extensions(0);
    119         } else if(ostrcmp("aafpanel_extensions_ipkremove", aafpanel_menuentry->name) == 0){
    120                 screenaafpanel_extensions(1);
    121         } else if(ostrcmp("aafpanel_extensions_tmpipkinstall", aafpanel_menuentry->name) == 0){
    122                 screenaafpanel_extensions(2);
     117        } else if(ostrcmp("panel_extensions_ipkinstall", panel_menuentry->name) == 0){
     118                screenpanel_extensions(0);
     119        } else if(ostrcmp("panel_extensions_ipkremove", panel_menuentry->name) == 0){
     120                screenpanel_extensions(1);
     121        } else if(ostrcmp("panel_extensions_tmpipkinstall", panel_menuentry->name) == 0){
     122                screenpanel_extensions(2);
    123123// infos main
    124         } else if(ostrcmp("aafpanel_infos", aafpanel_menuentry->name) == 0){
    125                 struct skin* screen = getscreen("aafpanel_infos_main");
    126                 aafpanel_menu(screen);
    127         } else if(ostrcmp("aafpanel_infos_aaf", aafpanel_menuentry->name) == 0){
    128                 screenaafpanel_infos(0);
    129         } else if(ostrcmp("aafpanel_infos_default", aafpanel_menuentry->name) == 0){
    130                 screenaafpanel_infos(1);
    131         } else if(ostrcmp("aafpanel_infos_free", aafpanel_menuentry->name) == 0){
    132                 screenaafpanel_infos(2);
    133         } else if(ostrcmp("aafpanel_infos_kernel", aafpanel_menuentry->name) == 0){
    134                 screenaafpanel_infos(3);
    135         } else if(ostrcmp("aafpanel_infos_mounts", aafpanel_menuentry->name) == 0){
    136                 screenaafpanel_infos(4);
    137         } else if(ostrcmp("aafpanel_infos_network", aafpanel_menuentry->name) == 0){
    138                 screenaafpanel_infos(5);
    139         } else if(ostrcmp("aafpanel_infos_ram", aafpanel_menuentry->name) == 0){
    140                 screenaafpanel_infos(6);
     124        } else if(ostrcmp("panel_infos_main", panel_menuentry->name) == 0){
     125                struct skin* screen = getscreen("panel_infos_main");
     126                panel_menu(screen);
     127        } else if(ostrcmp("panel_infos", panel_menuentry->name) == 0){
     128                screenpanel_infos(0);
     129        } else if(ostrcmp("panel_infos_default", panel_menuentry->name) == 0){
     130                screenpanel_infos(1);
     131        } else if(ostrcmp("panel_infos_free", panel_menuentry->name) == 0){
     132                screenpanel_infos(2);
     133        } else if(ostrcmp("panel_infos_kernel", panel_menuentry->name) == 0){
     134                screenpanel_infos(3);
     135        } else if(ostrcmp("panel_infos_mounts", panel_menuentry->name) == 0){
     136                screenpanel_infos(4);
     137        } else if(ostrcmp("panel_infos_network", panel_menuentry->name) == 0){
     138                screenpanel_infos(5);
     139        } else if(ostrcmp("panel_infos_ram", panel_menuentry->name) == 0){
     140                screenpanel_infos(6);
    141141// infos sysinfos
    142         } else if(ostrcmp("aafpanel_infos_sysinfo", aafpanel_menuentry->name) == 0){
    143                 struct skin* screen = getscreen("aafpanel_sysinfos_main");
    144                 aafpanel_menu(screen);
    145         } else if(ostrcmp("aafpanel_sysinfos_cpu", aafpanel_menuentry->name) == 0){
    146                 screenaafpanel_infos_sysinfo(0);
    147         } else if(ostrcmp("aafpanel_sysinfos_mem", aafpanel_menuentry->name) == 0){
    148                 screenaafpanel_infos_sysinfo(1);
    149         } else if(ostrcmp("aafpanel_sysinfos_mtd", aafpanel_menuentry->name) == 0){
    150                 screenaafpanel_infos_sysinfo(2);
    151         } else if(ostrcmp("aafpanel_sysinfos_module", aafpanel_menuentry->name) == 0){
    152                 screenaafpanel_infos_sysinfo(3);
    153         } else if(ostrcmp("aafpanel_sysinfos_devices", aafpanel_menuentry->name) == 0){
    154                 screenaafpanel_infos_sysinfo(4);
    155         } else if(ostrcmp("aafpanel_sysinfos_swap", aafpanel_menuentry->name) == 0){
    156                 screenaafpanel_infos_sysinfo(5);
    157         } else if(ostrcmp("aafpanel_sysinfos_top", aafpanel_menuentry->name) == 0){
    158                 screenaafpanel_infos_sysinfo(6);
     142        } else if(ostrcmp("panel_infos_sysinfo", panel_menuentry->name) == 0){
     143                struct skin* screen = getscreen("panel_sysinfos_main");
     144                panel_menu(screen);
     145        } else if(ostrcmp("panel_sysinfos_cpu", panel_menuentry->name) == 0){
     146                screenpanel_infos_sysinfo(0);
     147        } else if(ostrcmp("panel_sysinfos_mem", panel_menuentry->name) == 0){
     148                screenpanel_infos_sysinfo(1);
     149        } else if(ostrcmp("panel_sysinfos_mtd", panel_menuentry->name) == 0){
     150                screenpanel_infos_sysinfo(2);
     151        } else if(ostrcmp("panel_sysinfos_module", panel_menuentry->name) == 0){
     152                screenpanel_infos_sysinfo(3);
     153        } else if(ostrcmp("panel_sysinfos_devices", panel_menuentry->name) == 0){
     154                screenpanel_infos_sysinfo(4);
     155        } else if(ostrcmp("panel_sysinfos_swap", panel_menuentry->name) == 0){
     156                screenpanel_infos_sysinfo(5);
     157        } else if(ostrcmp("panel_sysinfos_top", panel_menuentry->name) == 0){
     158                screenpanel_infos_sysinfo(6);
    159159// autostart
    160         } else if(ostrcmp("aafpanel_autostart_default", aafpanel_menuentry->name) == 0){
    161                 screenaafpanel_settings_autostart(0);
    162         } else if(ostrcmp("aafpanel_autostart_audiovideo", aafpanel_menuentry->name) == 0){
    163                 screenaafpanel_settings_autostart(1);
    164         } else if(ostrcmp("aafpanel_autostart_usb", aafpanel_menuentry->name) == 0){
    165                 screenaafpanel_settings_autostart(2);
    166         } else if(ostrcmp("aafpanel_autostart_emu", aafpanel_menuentry->name) == 0){
    167                 screenaafpanel_settings_autostart(3);
    168         } else if(ostrcmp("aafpanel_autostart_network", aafpanel_menuentry->name) == 0){
    169                 screenaafpanel_settings_autostart(4);
    170         } else if(ostrcmp("aafpanel_autostart_safety", aafpanel_menuentry->name) == 0){
    171                 screenaafpanel_settings_autostart(5);
     160        } else if(ostrcmp("panel_autostart_default", panel_menuentry->name) == 0){
     161                screenpanel_settings_autostart(0);
     162        } else if(ostrcmp("panel_autostart_audiovideo", panel_menuentry->name) == 0){
     163                screenpanel_settings_autostart(1);
     164        } else if(ostrcmp("panel_autostart_usb", panel_menuentry->name) == 0){
     165                screenpanel_settings_autostart(2);
     166        } else if(ostrcmp("panel_autostart_emu", panel_menuentry->name) == 0){
     167                screenpanel_settings_autostart(3);
     168        } else if(ostrcmp("panel_autostart_network", panel_menuentry->name) == 0){
     169                screenpanel_settings_autostart(4);
     170        } else if(ostrcmp("panel_autostart_safety", panel_menuentry->name) == 0){
     171                screenpanel_settings_autostart(5);
    172172// videotune
    173         } else if(ostrcmp("aafpanel_settings_videotune", aafpanel_menuentry->name) == 0){
     173        } else if(ostrcmp("panel_settings_videotune", panel_menuentry->name) == 0){
    174174                screenvideosettings();
    175175        } else {
     
    181181}
    182182
    183 void aafpanel_main()
     183void panel_main()
    184184{
    185185        debug(1000, "in");
     
    187187        int rcret = 0, ret = 0;
    188188
    189         struct skin* aafpanel_main = getscreen("aafpanel_main");
    190         struct skin* listbox = getscreennode(aafpanel_main, "listbox");
    191 
    192         struct skin* aafpanel_main_selected = getscreennode(aafpanel_main, "aafpanel_main_selected_pic");
     189        struct skin* panel_main = getscreen("panel_main");
     190        struct skin* listbox = getscreennode(panel_main, "listbox");
     191
     192        struct skin* panel_main_selected = getscreennode(panel_main, "panel_main_selected_pic");
    193193        struct skin* child = NULL;
    194194
    195         drawscreen(aafpanel_main, 1);
    196         addscreenrc(aafpanel_main, listbox);
     195        drawscreen(panel_main, 1);
     196        addscreenrc(panel_main, listbox);
    197197
    198198        listbox->aktpage = -1;
     
    202202        while(child != NULL)
    203203        {
    204                 if(ostrcmp(child->name, "aafpanel_softcam") == 0){
     204                if(ostrcmp(child->name, "panel_softcam") == 0){
    205205                        if(checkemu() == 0){
    206206                                child->hidden = YES;
     
    215215        }
    216216
    217         drawscreen(aafpanel_main, 0);
     217        drawscreen(panel_main, 0);
    218218        if(listbox->select != NULL)
    219219        {
     
    225225        {
    226226                status.screencalc = 1;
    227                 rcret = waitrc(aafpanel_main, 0, 0);
     227                rcret = waitrc(panel_main, 0, 0);
    228228                status.screencalc = 0;
    229229
     
    232232                if(rcret == getrcconfigint("rcok", NULL))
    233233                {
    234                         clearscreen(aafpanel_main);
    235                         ret = aafpanel_menucall(listbox->select);
     234                        clearscreen(panel_main);
     235                        ret = panel_menucall(listbox->select);
    236236                        if(ret != 0)
    237237                                textbox(_("Message"), _("Menu not implemented !"), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
    238                         drawscreen(aafpanel_main, 0);
     238                        drawscreen(panel_main, 0);
    239239                }
    240                         debug(10, "[aafpanal_main] (select) menu=%s", listbox->select->name);
     240                        debug(10, "[panal_main] (select) menu=%s", listbox->select->name);
    241241                if(listbox->select != NULL && (rcret == getrcconfigint("rcup", NULL) || rcret == getrcconfigint("rcdown", NULL)))
    242242                {
    243243
    244                         debug(10, "[aafpanal_main] (select) menu=%s", listbox->select->name);
    245                         if(ostrcmp(listbox->select->name, "aafpanel_softcam") == 0){
    246                                 changepic(aafpanel_main_selected, "panel/skin/aafpanel_softcam.png");
    247                         } else if(ostrcmp(listbox->select->name, "aafpanel_settings") == 0){
    248                                 changepic(aafpanel_main_selected, "panel/skin/aafpanel_settings.png");
    249                         } else if(ostrcmp(listbox->select->name, "aafpanel_system") == 0){
    250                                 changepic(aafpanel_main_selected, "panel/skin/aafpanel_system.png");
    251                         } else if(ostrcmp(listbox->select->name, "aafpanel_extensions") == 0){
    252                                 changepic(aafpanel_main_selected, "panel/skin/aafpanel_extensions.png");
    253                         } else if(ostrcmp(listbox->select->name, "aafpanel_infos") == 0){
    254                                 changepic(aafpanel_main_selected, "panel/skin/aafpanel_infos.png");
     244                        debug(10, "[panal_main] (select) menu=%s", listbox->select->name);
     245                        if(ostrcmp(listbox->select->name, "panel_softcam") == 0){
     246                                changepic(panel_main_selected, "panel/skin/panel_softcam.png");
     247                        } else if(ostrcmp(listbox->select->name, "panel_settings") == 0){
     248                                changepic(panel_main_selected, "panel/skin/panel_settings.png");
     249                        } else if(ostrcmp(listbox->select->name, "panel_system") == 0){
     250                                changepic(panel_main_selected, "panel/skin/panel_system.png");
     251                        } else if(ostrcmp(listbox->select->name, "panel_extensions") == 0){
     252                                changepic(panel_main_selected, "panel/skin/panel_extensions.png");
     253                        } else if(ostrcmp(listbox->select->name, "panel_infos") == 0){
     254                                changepic(panel_main_selected, "panel/skin/panel_infos.png");
    255255                        }
    256256                }
    257                 drawscreen(aafpanel_main, 0);
     257                drawscreen(panel_main, 0);
    258258                if(listbox->select != NULL)
    259259                        writevfd(listbox->select->text);
    260260        }
    261261
    262         delownerrc(aafpanel_main);
    263         clearscreen(aafpanel_main);
    264         //delscreen(aafpanel_main);
     262        delownerrc(panel_main);
     263        clearscreen(panel_main);
     264        //delscreen(panel_main);
    265265        status.hangtime = getconfigint("hangtime", NULL);
    266266        debug(1000, "out");
  • titan/plugins/panel/panel_settings.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SETTINGS_H
    2 #define AAFPANEL_SETTINGS_H
     1#ifndef PANEL_SETTINGS_H
     2#define PANEL_SETTINGS_H
    33
    44// mode 0 = Betaconfig
     
    66// mode 2 = Red Button
    77
    8 void screenaafpanel_settings(int mode)
     8void screenpanel_settings(int mode)
    99{
    1010        int rcret = 0;
    11         struct skin* aaf_config = getscreen("aafpanel_config");
    12         struct skin* listbox = getscreennode(aaf_config, "listbox");
     11        struct skin* config = getscreen("panel_config");
     12        struct skin* listbox = getscreennode(config, "listbox");
    1313        struct skin* node = NULL;
    1414        struct skin* tmp = NULL;
    1515
    16         addscreenrc(aaf_config, listbox);
     16        addscreenrc(config, listbox);
    1717        listbox->aktline = 1;
    1818        listbox->aktpage = 1;
    1919
    2020        if (mode == 0){
    21                 changetitle(aaf_config, _("AAF Beta Config"));
     21                changetitle(config, _("Beta Config"));
    2222
    23                 node = addlistbox(aaf_config, listbox, node, 1);
     23                node = addlistbox(config, listbox, node, 1);
    2424                node->type = INPUTBOX;
    2525                changetext(node, _("User"));
     
    2727                changeinput(node, getownconfigq(node->name));
    2828
    29                 node = addlistbox(aaf_config, listbox, node, 1);
     29                node = addlistbox(config, listbox, node, 1);
    3030                node->type = INPUTBOX;
    3131                changetext(node, _("Password"));
     
    3535
    3636        if (mode == 1){
    37                 changetitle(aaf_config, _("AAF Automount Config"));
     37                changetitle(config, _("Automount Config"));
    3838
    39                 node = addlistbox(aaf_config, listbox, node, 1);
     39                node = addlistbox(config, listbox, node, 1);
    4040                node->type = CHOICEBOX;
    4141                changetext(node, _("Ntfs Write"));
     
    4848
    4949        if (mode == 2){
    50                 changetitle(aaf_config, _("AAF Red Button Config"));
     50                changetitle(config, _("Red Button Config"));
    5151
    52                 node = addlistbox(aaf_config, listbox, node, 1);
     52                node = addlistbox(config, listbox, node, 1);
    5353                node->type = CHOICEBOX;
    54                 changetext(node, _("Open AAF-Panel when pressing red button:"));
     54                changetext(node, _("Open Panel when pressing red button:"));
    5555                changename(node, "redpanel");
    5656                addchoicebox(node, "0", _("no"));
     
    5959        }
    6060
    61         drawscreen(aaf_config, 0);
     61        drawscreen(config, 0);
    6262        tmp = listbox->select;
    6363
    6464        while(1)
    6565        {
    66                 addscreenrc(aaf_config, tmp);
    67                 rcret = waitrc(aaf_config, 0, 0);
     66                addscreenrc(config, tmp);
     67                rcret = waitrc(config, 0, 0);
    6868                tmp = listbox->select;
    6969
     
    8888
    8989        delownconfigtmpall();
    90         delmarkedscreennodes(aaf_config, 1);
    91         delownerrc(aaf_config);
    92         clearscreen(aaf_config);
     90        delmarkedscreennodes(config, 1);
     91        delownerrc(config);
     92        clearscreen(config);
    9393}
    9494
  • titan/plugins/panel/panel_settings_autostart.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SETTINGS_AUTOSTART_H
    2 #define AAFPANEL_SETTINGS_AUTOSTART_H
     1#ifndef PANEL_SETTINGS_AUTOSTART_H
     2#define PANEL_SETTINGS_AUTOSTART_H
    33
    44// mode 0 = Defaults
     
    99// mode 5 = Child safety
    1010
    11 void screenaafpanel_settings_autostart(int mode)
     11void screenpanel_settings_autostart(int mode)
    1212{
    1313        int rcret = 0;
    14         struct skin* aaf_config = getscreen("aafpanel_config");
    15         struct skin* listbox = getscreennode(aaf_config, "listbox");
     14        struct skin* panel_config = getscreen("panel_config");
     15        struct skin* listbox = getscreennode(panel_config, "listbox");
    1616        struct skin* node = NULL;
    1717        struct skin* tmp = NULL;
    1818
    19         addscreenrc(aaf_config, listbox);
     19        addscreenrc(panel_config, listbox);
    2020        listbox->aktline = 1;
    2121        listbox->aktpage = 1;
     
    2424                int i = 0;
    2525
    26                 changetitle(aaf_config, _("AAF autostart Defaults"));
     26                changetitle(panel_config, _("Autostart Defaults"));
    2727
    2828                if(file_exist("/etc/.usbimage")){
    29                         node = addlistbox(aaf_config, listbox, node, 1);
     29                        node = addlistbox(panel_config, listbox, node, 1);
    3030                        node->type = CHOICEBOX;
    3131                        changetext(node, _("fsckroot")); changename(node, "fsckroot");
     
    3434                }
    3535
    36                 node = addlistbox(aaf_config, listbox, node, 1);
     36                node = addlistbox(panel_config, listbox, node, 1);
    3737                node->type = CHOICEBOX;
    3838                changetext(node, _("bootstop")); changename(node, "bootstop");
     
    4646                setchoiceboxselection(node, getownconfig(node->name));
    4747
    48                 node = addlistbox(aaf_config, listbox, node, 1);
     48                node = addlistbox(panel_config, listbox, node, 1);
    4949                node->type = CHOICEBOX;
    5050                changetext(node, _("debug")); changename(node, "debug");
     
    5353                setchoiceboxselection(node, getownconfig(node->name));
    5454
    55                 node = addlistbox(aaf_config, listbox, node, 1);
     55                node = addlistbox(panel_config, listbox, node, 1);
    5656                node->type = CHOICEBOX;
    5757                changetext(node, _("logto")); changename(node, "logto");
     
    6060                setchoiceboxselection(node, getownconfig(node->name));
    6161
    62                 node = addlistbox(aaf_config, listbox, node, 1);
     62                node = addlistbox(panel_config, listbox, node, 1);
    6363                node->type = CHOICEBOX;
    6464                changetext(node, _("errorboot")); changename(node, "errorboot");
     
    6666                setchoiceboxselection(node, getownconfig(node->name));
    6767
    68                 node = addlistbox(aaf_config, listbox, node, 1);
     68                node = addlistbox(panel_config, listbox, node, 1);
    6969                node->type = CHOICEBOX;
    7070                changetext(node, _("repairmodus")); changename(node, "repairmodus");
     
    7373                setchoiceboxselection(node, getownconfig(node->name));
    7474
    75                 node = addlistbox(aaf_config, listbox, node, 1);
     75                node = addlistbox(panel_config, listbox, node, 1);
    7676                node->type = CHOICEBOX;
    7777                changetext(node, _("rmcrashlog")); changename(node, "rmcrashlog");
     
    7979                setchoiceboxselection(node, getownconfig(node->name));
    8080
    81                 node = addlistbox(aaf_config, listbox, node, 1);
     81                node = addlistbox(panel_config, listbox, node, 1);
    8282                node->type = CHOICEBOX;
    8383                changetext(node, _("rmemthy")); changename(node, "rmemthy");
     
    8585                setchoiceboxselection(node, getownconfig(node->name));
    8686
    87                 node = addlistbox(aaf_config, listbox, node, 1);
     87                node = addlistbox(panel_config, listbox, node, 1);
    8888                node->type = CHOICEBOX;
    8989                changetext(node, _("plugload")); changename(node, "plugload");
     
    9191                setchoiceboxselection(node, getownconfig(node->name));
    9292
    93                 node = addlistbox(aaf_config, listbox, node, 1);
     93                node = addlistbox(panel_config, listbox, node, 1);
    9494                node->type = CHOICEBOX;
    9595                changetext(node, _("progressbar")); changename(node, "progressbar");
     
    9797                setchoiceboxselection(node, getownconfig(node->name));
    9898
    99                 node = addlistbox(aaf_config, listbox, node, 1);
     99                node = addlistbox(panel_config, listbox, node, 1);
    100100                node->type = CHOICEBOX;
    101101                changetext(node, _("showip")); changename(node, "showip");
     
    103103                setchoiceboxselection(node, getownconfig(node->name));
    104104
    105                 node = addlistbox(aaf_config, listbox, node, 1);
     105                node = addlistbox(panel_config, listbox, node, 1);
    106106                node->type = CHOICEBOX;
    107107                changetext(node, _("showtvinfo")); changename(node, "showtvinfo");
     
    109109                setchoiceboxselection(node, getownconfig(node->name));
    110110
    111                 node = addlistbox(aaf_config, listbox, node, 1);
     111                node = addlistbox(panel_config, listbox, node, 1);
    112112                node->type = CHOICEBOX;
    113113                changetext(node, _("playlist")); changename(node, "playlist");
     
    115115                setchoiceboxselection(node, getownconfig(node->name));
    116116
    117                 node = addlistbox(aaf_config, listbox, node, 1);
     117                node = addlistbox(panel_config, listbox, node, 1);
    118118                node->type = CHOICEBOX;
    119119                changetext(node, _("updatelist")); changename(node, "updatelist");
     
    130130        if (mode == 1){
    131131
    132                 changetitle(aaf_config, _("AAF autostart Defaults"));
     132                changetitle(panel_config, _("Autostart Defaults"));
    133133
    134134                if(isfile("/var/bin/audio.elf") || isfile("/boot/audio.old.elf")){
    135                         node = addlistbox(aaf_config, listbox, node, 1);
     135                        node = addlistbox(panel_config, listbox, node, 1);
    136136                        node->type = CHOICEBOX;
    137137                        changetext(node, _("Old Audiofw")); changename(node, "oldaudiofw");
     
    140140                }
    141141
    142                 node = addlistbox(aaf_config, listbox, node, 1);
     142                node = addlistbox(panel_config, listbox, node, 1);
    143143                node->type = CHOICEBOX;
    144144                changetext(node, _("No Audiosync")); changename(node, "noaudiosync");
     
    146146                setchoiceboxselection(node, getownconfig(node->name));
    147147
    148                 node = addlistbox(aaf_config, listbox, node, 1);
     148                node = addlistbox(panel_config, listbox, node, 1);
    149149                node->type = CHOICEBOX;
    150150                changetext(node, _("Boot Resolution")); changename(node, "BootResolution");
     
    152152                setchoiceboxselection(node, getownconfig(node->name));
    153153
    154                 node = addlistbox(aaf_config, listbox, node, 1);
     154                node = addlistbox(panel_config, listbox, node, 1);
    155155                node->type = CHOICEBOX;
    156156                changetext(node, _("Bootlogo")); changename(node, "bootlogo");
     
    158158                setchoiceboxselection(node, getownconfig(node->name));
    159159
    160                 node = addlistbox(aaf_config, listbox, node, 1);
     160                node = addlistbox(panel_config, listbox, node, 1);
    161161                node->type = CHOICEBOX;
    162162                changetext(node, _("Poweroff")); changename(node, "poweroff");
     
    164164                setchoiceboxselection(node, getownconfig(node->name));
    165165
    166                 node = addlistbox(aaf_config, listbox, node, 1);
     166                node = addlistbox(panel_config, listbox, node, 1);
    167167                node->type = CHOICEBOX;
    168168                changetext(node, _("Scart On Standby")); changename(node, "scartonstandby");
     
    170170                setchoiceboxselection(node, getownconfig(node->name));
    171171
    172                 node = addlistbox(aaf_config, listbox, node, 1);
     172                node = addlistbox(panel_config, listbox, node, 1);
    173173                node->type = CHOICEBOX;
    174174                changetext(node, _("HighSR")); changename(node, "HighSR");
     
    176176                setchoiceboxselection(node, getownconfig(node->name));
    177177
    178                 node = addlistbox(aaf_config, listbox, node, 1);
     178                node = addlistbox(panel_config, listbox, node, 1);
    179179                node->type = CHOICEBOX;
    180180                changetext(node, _("Tuner Sleep Off")); changename(node, "tuner_sleep_off");
     
    182182                setchoiceboxselection(node, getownconfig(node->name));
    183183
    184                 node = addlistbox(aaf_config, listbox, node, 1);
     184                node = addlistbox(panel_config, listbox, node, 1);
    185185                node->type = CHOICEBOX;
    186186                changetext(node, _("Boot RGB Fix")); changename(node, "bootrgbfix");
     
    193193                int tmpsize = 0;
    194194
    195                 changetitle(aaf_config, _("AAF autostart USB"));
    196 
    197                 node = addlistbox(aaf_config, listbox, node, 1);
     195                changetitle(panel_config, _("Autostart USB"));
     196
     197                node = addlistbox(panel_config, listbox, node, 1);
    198198                node->type = CHOICEBOX;
    199199                changetext(node, _("Load Partition")); changename(node, "loadpartition");
     
    201201                setchoiceboxselection(node, getownconfig(node->name));
    202202
    203                 node = addlistbox(aaf_config, listbox, node, 1);
     203                node = addlistbox(panel_config, listbox, node, 1);
    204204                node->type = CHOICEBOX;
    205205                changetext(node, _("Fsck Record")); changename(node, "fsckrecord");
     
    207207                setchoiceboxselection(node, getownconfig(node->name));
    208208
    209                 node = addlistbox(aaf_config, listbox, node, 1);
     209                node = addlistbox(panel_config, listbox, node, 1);
    210210                node->type = CHOICEBOX;
    211211                changetext(node, _("Swap")); changename(node, "swap");
    212212                addchoicebox(node, "y", _("yes")); addchoicebox(node, "n", _("no"));
    213213                setchoiceboxselection(node, getownconfig(node->name));
    214                 node = addlistbox(aaf_config, listbox, node, 1);
     214                node = addlistbox(panel_config, listbox, node, 1);
    215215                node->type = CHOICEBOX;
    216216                changetext(node, _("Swap Size")); changename(node, "swapsize");
     
    226226                setchoiceboxselection(node, getownconfig(node->name));
    227227
    228                 node = addlistbox(aaf_config, listbox, node, 1);
     228                node = addlistbox(panel_config, listbox, node, 1);
    229229                node->type = CHOICEBOX;
    230230                changetext(node, _("Fsck Swap")); changename(node, "fsckswap");
     
    232232                setchoiceboxselection(node, getownconfig(node->name));
    233233
    234                 node = addlistbox(aaf_config, listbox, node, 1);
     234                node = addlistbox(panel_config, listbox, node, 1);
    235235                node->type = CHOICEBOX;
    236236                changetext(node, _("Record Max Sectors")); changename(node, "RecordMaxSectors");
     
    246246                setchoiceboxselection(node, getownconfig(node->name));
    247247
    248                 node = addlistbox(aaf_config, listbox, node, 1);
     248                node = addlistbox(panel_config, listbox, node, 1);
    249249                node->type = CHOICEBOX;
    250250                changetext(node, _("Swap Max Sectors")); changename(node, "SwapMaxSectors");
     
    264264        if (mode == 3){
    265265
    266                 changetitle(aaf_config, _("AAF autostart EMU"));
    267 
    268                 node = addlistbox(aaf_config, listbox, node, 1);
     266                changetitle(panel_config, _("Autostart EMU"));
     267
     268                node = addlistbox(panel_config, listbox, node, 1);
    269269                node->type = CHOICEBOX;
    270270                changetext(node, _("Emu Control")); changename(node, "emucontrol");
     
    272272                setchoiceboxselection(node, getownconfig(node->name));
    273273
    274                 node = addlistbox(aaf_config, listbox, node, 1);
     274                node = addlistbox(panel_config, listbox, node, 1);
    275275                node->type = CHOICEBOX;
    276276                changetext(node, _("ftdi")); changename(node, "ftdi");
     
    278278                setchoiceboxselection(node, getownconfig(node->name));
    279279
    280                 node = addlistbox(aaf_config, listbox, node, 1);
     280                node = addlistbox(panel_config, listbox, node, 1);
    281281                node->type = CHOICEBOX;
    282282                changetext(node, _("pl2303")); changename(node, "pl2303");
     
    284284                setchoiceboxselection(node, getownconfig(node->name));
    285285
    286                 node = addlistbox(aaf_config, listbox, node, 1);
     286                node = addlistbox(panel_config, listbox, node, 1);
    287287                node->type = CHOICEBOX;
    288288                changetext(node, _("Nr Usbreaders")); changename(node, "nr_usbreaders");
     
    293293                setchoiceboxselection(node, getownconfig(node->name));
    294294
    295                 node = addlistbox(aaf_config, listbox, node, 1);
     295                node = addlistbox(panel_config, listbox, node, 1);
    296296                node->type = CHOICEBOX;
    297297                changetext(node, _("Iwatch")); changename(node, "iwatch");
     
    302302        if (mode == 4){
    303303
    304                 changetitle(aaf_config, "AAF autostart NETWORK");
    305 
    306                 node = addlistbox(aaf_config, listbox, node, 1);
     304                changetitle(panel_config, "Autostart NETWORK");
     305
     306                node = addlistbox(panel_config, listbox, node, 1);
    307307                node->type = CHOICEBOX;
    308308                changetext(node, _("nfs server")); changename(node, "nfsserver");
     
    310310                setchoiceboxselection(node, getownconfig(node->name));
    311311
    312                 node = addlistbox(aaf_config, listbox, node, 1);
     312                node = addlistbox(panel_config, listbox, node, 1);
    313313                node->type = CHOICEBOX;
    314314                changetext(node, _("samba server")); changename(node, "sambaserver");
     
    316316                setchoiceboxselection(node, getownconfig(node->name));
    317317
    318                 node = addlistbox(aaf_config, listbox, node, 1);
     318                node = addlistbox(panel_config, listbox, node, 1);
    319319                node->type = CHOICEBOX;
    320320                changetext(node, _("scan wlan")); changename(node, "wlan");
     
    325325        if (mode == 5){
    326326
    327                 changetitle(aaf_config, _("AAF autostart Child Safety"));
    328 
    329                 node = addlistbox(aaf_config, listbox, node, 1);
     327                changetitle(panel_config, _("Autostart Child Safety"));
     328
     329                node = addlistbox(panel_config, listbox, node, 1);
    330330                node->type = CHOICEBOX;
    331331                changetext(node, _("Parental")); changename(node, "Parental");
     
    333333                setchoiceboxselection(node, getownconfig(node->name));
    334334
    335                 node = addlistbox(aaf_config, listbox, node, 1);
     335                node = addlistbox(panel_config, listbox, node, 1);
    336336                node->type = INPUTBOXNUM;
    337337                changetext(node, _("Pin")); changename(node, "Pin");
     
    344344        }
    345345
    346         drawscreen(aaf_config, 0);
     346        drawscreen(panel_config, 0);
    347347        tmp = listbox->select;
    348348
    349349        while(1)
    350350        {
    351                 addscreenrc(aaf_config, tmp);
    352                 rcret = waitrc(aaf_config, 0, 0);
     351                addscreenrc(panel_config, tmp);
     352                rcret = waitrc(panel_config, 0, 0);
    353353                tmp = listbox->select;
    354354
     
    370370
    371371        delownconfigtmpall();
    372         delmarkedscreennodes(aaf_config, 1);
    373         delownerrc(aaf_config);
    374         clearscreen(aaf_config);
     372        delmarkedscreennodes(panel_config, 1);
     373        delownerrc(panel_config);
     374        clearscreen(panel_config);
    375375}
    376376
  • titan/plugins/panel/panel_settings_bluebutton.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SETTINGS_BLUEBUTTON_H
    2 #define AAFPANEL_SETTINGS_BLUEBUTTON_H
     1#ifndef PANEL_SETTINGS_BLUEBUTTON_H
     2#define PANEL_SETTINGS_BLUEBUTTON_H
    33
    4 void screenaafpanel_settings_bluebutton()
     4void screenpanel_settings_bluebutton()
    55{
    66        debug(1000, "in");
  • titan/plugins/panel/panel_settings_fancontrol.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SETTINGS_FANCONTROL_H
    2 #define AAFPANEL_SETTINGS_FANCONTROL_H
     1#ifndef PANEL_SETTINGS_FANCONTROL_H
     2#define PANEL_SETTINGS_FANCONTROL_H
    33
    44
    55
    6 void screenaafpanel_settings_fancontrol()
     6void screenpanel_settings_fancontrol()
    77{
    88        int rcret = 0;
     
    1010        char* speedWert = NULL;
    1111       
    12         struct skin* aaf_fancontrol = getscreen("aafpanel_settings_fancontrol");
    13         struct skin* fanprogress = getscreennode(aaf_fancontrol, "fanprogress");
     12        struct skin* panel_fancontrol = getscreen("panel_settings_fancontrol");
     13        struct skin* fanprogress = getscreennode(panel_fancontrol, "fanprogress");
    1414
    1515        speedWert = getconfig("fanspeed", NULL);
     
    3131               
    3232        fanprogress->progresssize = speed;
    33         drawscreen(aaf_fancontrol, 0);
     33        drawscreen(panel_fancontrol, 0);
    3434
    3535        while(1)
    3636        {
    37                 rcret = waitrc(aaf_fancontrol, 0, 0);
     37                rcret = waitrc(panel_fancontrol, 0, 0);
    3838
    3939                if(rcret == getrcconfigint("rcexit", NULL)) {
     
    5050                        fanprogress->progresssize = speed;
    5151                        setfanspeed(speed, 0);
    52                         drawscreen(aaf_fancontrol, 0);
     52                        drawscreen(panel_fancontrol, 0);
    5353                }
    5454                if(rcret == getrcconfigint("rcright", NULL)){
     
    5757                        fanprogress->progresssize = speed;
    5858                        setfanspeed(speed, 0);
    59                         drawscreen(aaf_fancontrol, 0);
     59                        drawscreen(panel_fancontrol, 0);
    6060                }
    6161        }
  • titan/plugins/panel/panel_settings_overclocking.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SETTINGS_OVERCLOCKING_H
    2 #define AAFPANEL_SETTINGS_OVERCLOCKING_H
     1#ifndef PANEL_SETTINGS_OVERCLOCKING_H
     2#define PANEL_SETTINGS_OVERCLOCKING_H
    33
    44void read_cpufreq(struct skin* label)
     
    6969        if(isfile("/proc/cpu_frequ/pll0_ndiv_mdiv") == 0)
    7070        {
    71                 debug(10, "[screenaafpanel_settings_overclock] file not found%s", "/proc/cpu_frequ/pll0_ndiv_mdiv");
    72                 return;
    73         }
    74 
    75         debug(10, "[screenaafpanel_settings_overclock] inifreq=%s oldfreq=%s => newfreq=%s", inifreq, oldfreq, newfreq);
     71                debug(10, "[screenpanel_settings_overclock] file not found%s", "/proc/cpu_frequ/pll0_ndiv_mdiv");
     72                return;
     73        }
     74
     75        debug(10, "[screenpanel_settings_overclock] inifreq=%s oldfreq=%s => newfreq=%s", inifreq, oldfreq, newfreq);
    7676
    7777        if(ostrcmp(newfreq, inifreq) == 0 && ostrcmp(newfreq, oldfreq) == 0)
    7878        {
    79                 debug(10, "[screenaafpanel_settings_overclock] Nothing to change in FREQ");
     79                debug(10, "[screenpanel_settings_overclock] Nothing to change in FREQ");
    8080                return;
    8181        }
     
    8787        tmpstr = ostrcat(tmpstr, "\" > /proc/cpu_frequ/pll0_ndiv_mdiv", 1, 0);
    8888
    89         debug(10, "[screenaafpanel_settings_overclock] Set FREQ to %s", newfreq);
     89        debug(10, "[screenpanel_settings_overclock] Set FREQ to %s", newfreq);
    9090        system(tmpstr);
    9191
     
    105105        if(isfile("/proc/cpu_frequ/pll1_fdma_bypass") == 0)
    106106        {
    107                 debug(10, "[screenaafpanel_settings_overclock] file not found%s", "/proc/cpu_frequ/pll1_fdma_bypass");
     107                debug(10, "[screenpanel_settings_overclock] file not found%s", "/proc/cpu_frequ/pll1_fdma_bypass");
    108108                return;
    109109        }
     
    111111        if(ostrcmp(newfdma, inifdma) == 0 && ostrcmp(newfdma, oldfdma) == 0)
    112112        {
    113                 debug(10, "[screenaafpanel_settings_overclock] Nothing to change in FDMA");
     113                debug(10, "[screenpanel_settings_overclock] Nothing to change in FDMA");
    114114                return;
    115115        }
     
    121121        tmpstr = ostrcat(tmpstr, "\" > /proc/cpu_frequ/pll1_fdma_bypass", 1, 0);
    122122
    123         debug(10, "[screenaafpanel_settings_overclock] Set FDMA to %s", newfdma);
     123        debug(10, "[screenpanel_settings_overclock] Set FDMA to %s", newfdma);
    124124        system(tmpstr);
    125125
     
    156156}
    157157
    158 void screenaafpanel_settings_overclocking()
     158void screenpanel_settings_overclocking()
    159159{
    160160        int rcret = 0;
    161         struct skin* aaf_overclock = getscreen("aafpanel_settings_overclocking");
    162         struct skin* listbox = getscreennode(aaf_overclock, "listbox");
    163         struct skin* label1 = getscreennode(aaf_overclock, "label1");
     161        struct skin* panel_overclock = getscreen("panel_settings_overclocking");
     162        struct skin* listbox = getscreennode(panel_overclock, "listbox");
     163        struct skin* label1 = getscreennode(panel_overclock, "label1");
    164164        struct skin* node = NULL;
    165165        struct skin* tmp = NULL;
     
    170170        char* inifdma = NULL, *oldfdma = NULL;
    171171
    172         addscreenrc(aaf_overclock, listbox);
     172        addscreenrc(panel_overclock, listbox);
    173173
    174174        if(checkbox("UFS912") || checkbox("AT7500") || checkbox("SPARK"))
     
    187187        }
    188188
    189         node = addlistbox(aaf_overclock, listbox, node, 1);
     189        node = addlistbox(panel_overclock, listbox, node, 1);
    190190        if(node != NULL)
    191191        {
     
    196196        }
    197197
    198         node = addlistbox(aaf_overclock, listbox, node, 1);
     198        node = addlistbox(panel_overclock, listbox, node, 1);
    199199        if(node != NULL)
    200200        {
     
    207207        if(checkbox("UFS912") == 0 && checkbox("AT7500") == 0 && checkbox("SPARK") == 0)
    208208        {
    209                 node = addlistbox(aaf_overclock, listbox, node, 1);
     209                node = addlistbox(panel_overclock, listbox, node, 1);
    210210                if(node != NULL)
    211211                {
     
    217217        }
    218218
    219         node = addlistbox(aaf_overclock, listbox, node, 1);
     219        node = addlistbox(panel_overclock, listbox, node, 1);
    220220        if(node != NULL)
    221221        {
     
    227227                if(ostrcmp(getownconfig(node->name), "1") == 0)
    228228                {
    229                         node = addlistbox(aaf_overclock, listbox, node, 1);
     229                        node = addlistbox(panel_overclock, listbox, node, 1);
    230230                        if(node != NULL)
    231231                        {
     
    238238                else
    239239                {
    240                         node = addlistbox(aaf_overclock, listbox, node, 1);
     240                        node = addlistbox(panel_overclock, listbox, node, 1);
    241241                        if(node != NULL)
    242242                        {
     
    249249        if(checkbox("UFS912") == 0 && checkbox("AT7500") == 0 && checkbox("SPARK") == 0)
    250250        {
    251                 node = addlistbox(aaf_overclock, listbox, node, 1);
     251                node = addlistbox(panel_overclock, listbox, node, 1);
    252252                if(node != NULL)
    253253                {
     
    260260
    261261        read_cpufreq(label1);
    262         drawscreen(aaf_overclock, 0);
     262        drawscreen(panel_overclock, 0);
    263263
    264264        inifreq = getlistvalue(listbox,"pll0_ndiv_mdiv");
     
    271271        while(1)
    272272        {
    273                 addscreenrc(aaf_overclock, tmp);
    274                 rcret = waitrc(aaf_overclock, 0, 0);
     273                addscreenrc(panel_overclock, tmp);
     274                rcret = waitrc(panel_overclock, 0, 0);
    275275                tmp = listbox->select;
    276276
     
    285285                        set_fdma(oldfdma, oldfdma, getownconfig("pll1_fdma_bypass"));
    286286                        read_cpufreq(label1);
    287                         drawscreen(aaf_overclock, 0);
     287                        drawscreen(panel_overclock, 0);
    288288                }
    289289
     
    306306                                        changeinput(listbox->select, NULL);
    307307                                }
    308                                 drawscreen(aaf_overclock, 0);
     308                                drawscreen(panel_overclock, 0);
    309309                        }
    310310                }
     
    322322        inifreq = NULL; oldfreq = NULL; inifdma = NULL; oldfdma = NULL;
    323323        delownconfigtmpall();
    324         delmarkedscreennodes(aaf_overclock, 1);
    325         delownerrc(aaf_overclock);
    326         clearscreen(aaf_overclock);
     324        delmarkedscreennodes(panel_overclock, 1);
     325        delownerrc(panel_overclock);
     326        clearscreen(panel_overclock);
    327327}
    328328
  • titan/plugins/panel/panel_settings_redbutton.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SETTINGS_REDBUTTON_H
    2 #define AAFPANEL_SETTINGS_REDBUTTON_H
     1#ifndef PANEL_SETTINGS_REDBUTTON_H
     2#define PANEL_SETTINGS_REDBUTTON_H
    33
    4 void screenaafpanel_settings_redbutton()
     4void screenpanel_settings_redbutton()
    55{
    66        debug(1000, "in");
  • titan/plugins/panel/panel_softcam.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SOFTCAM_H
    2 #define AAFPANEL_SOFTCAM_H
     1#ifndef PANEL_SOFTCAM_H
     2#define PANEL_SOFTCAM_H
    33
    44char* swhichcam = NULL;
     
    109109{
    110110        struct clist* elist = NULL;
    111         struct skin* screen = getscreen("aafpanel_softcam");
     111        struct skin* screen = getscreen("panel_softcam");
    112112        struct skin* listbox = getscreennode(screen, "listbox");
    113113        struct skin* node = NULL;
     
    225225}
    226226
    227 void screenaafpanel_softcam()
     227void screenpanel_softcam()
    228228{
    229229        int rcret = 0;
    230         struct skin* aafpanel_softcam = getscreen("aafpanel_softcam");
    231         struct skin* listbox = getscreennode(aafpanel_softcam, "listbox");
    232         struct skin* labelecminfo = getscreennode(aafpanel_softcam, "ecminfo");
    233         struct skin* menutitle = getscreennode(aafpanel_softcam, "menutitle");
    234         struct skin* b_red = getscreennode(aafpanel_softcam, "b1");
    235         struct skin* b_green = getscreennode(aafpanel_softcam, "b2");
    236         struct skin* b_yellow = getscreennode(aafpanel_softcam, "b3");
    237         struct skin* b_blue = getscreennode(aafpanel_softcam, "b4");
     230        struct skin* panel_softcam = getscreen("panel_softcam");
     231        struct skin* listbox = getscreennode(panel_softcam, "listbox");
     232        struct skin* labelecminfo = getscreennode(panel_softcam, "ecminfo");
     233        struct skin* menutitle = getscreennode(panel_softcam, "menutitle");
     234        struct skin* b_red = getscreennode(panel_softcam, "b1");
     235        struct skin* b_green = getscreennode(panel_softcam, "b2");
     236        struct skin* b_yellow = getscreennode(panel_softcam, "b3");
     237        struct skin* b_blue = getscreennode(panel_softcam, "b4");
    238238        struct skin* tmp = NULL;
    239239
     
    254254        fillmenubox();
    255255
    256         drawscreen(aafpanel_softcam, 0);
    257         addscreenrc(aafpanel_softcam, listbox);
     256        drawscreen(panel_softcam, 0);
     257        addscreenrc(panel_softcam, listbox);
    258258
    259259        tmp = listbox->select;
     
    261261        while(1)
    262262        {
    263                 addscreenrc(aafpanel_softcam, tmp);
    264                 rcret = waitrc(aafpanel_softcam, 4000, 0);
     263                addscreenrc(panel_softcam, tmp);
     264                rcret = waitrc(panel_softcam, 4000, 0);
    265265                tmp = listbox->select;
    266266
     
    269269                        // deactivate emu
    270270                        deactivate(tmp->name);
    271                         drawscreen(aafpanel_softcam, 0);
     271                        drawscreen(panel_softcam, 0);
    272272                }
    273273                if(rcret == getrcconfigint("rcgreen", NULL)){
    274274                        // restart emu
    275275                        restartcam(tmp->name);
    276                         drawscreen(aafpanel_softcam, 0);
     276                        drawscreen(panel_softcam, 0);
    277277                }
    278278                if(rcret == getrcconfigint("rcyellow", NULL)){
     
    281281                        readmenu();
    282282                        fillmenubox();
    283                         drawscreen(aafpanel_softcam, 0);
     283                        drawscreen(panel_softcam, 0);
    284284                }
    285285                if(rcret == getrcconfigint("rcblue", NULL)){
    286286                        // activate emu
    287287                        activate(tmp->name);
    288                         drawscreen(aafpanel_softcam, 0);
     288                        drawscreen(panel_softcam, 0);
    289289                }
    290290                if(rcret == getrcconfigint("rcok", NULL)){
     
    296296                                startcam(tmp->name);
    297297                        }
    298                         drawscreen(aafpanel_softcam, 0);
     298                        drawscreen(panel_softcam, 0);
    299299                }
    300300                if(rcret == RCTIMEOUT){
    301301                        // update ecminfo
    302302                        readecminfo(labelecminfo);
    303                         drawscreen(aafpanel_softcam, 0);
     303                        drawscreen(panel_softcam, 0);
    304304                }
    305305        }
     
    309309
    310310        free(swhichcam);
    311         delmarkedscreennodes(aafpanel_softcam, 1);
    312         delownerrc(aafpanel_softcam);
    313         clearscreen(aafpanel_softcam);
     311        delmarkedscreennodes(panel_softcam, 1);
     312        delownerrc(panel_softcam);
     313        clearscreen(panel_softcam);
    314314}
    315315
  • titan/plugins/panel/panel_system.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SYSTEM_H
    2 #define AAFPANEL_SYSTEM_H
    3 
    4 void screenaafpanel_system_update(int mode)
     1#ifndef PANEL_SYSTEM_H
     2#define PANEL_SYSTEM_H
     3
     4void screenpanel_system_update(int mode)
    55{
    66        debug(50, "(start) mode=%d", mode);
     
    88
    99        status.hangtime = 99999;
    10         struct skin* aafpanel_system = getscreen("aafpanel_system_main");
    11         drawscreen(aafpanel_system, 0);
     10        struct skin* panel_system = getscreen("panel_system_main");
     11        drawscreen(panel_system, 0);
    1212
    1313        char* tmpstr = NULL;
     
    2121        if (mode == 0){
    2222                system("/sbin/update.sh getfilelist");
    23                 skinname = "aafpanel_system_update_flash_online_menu";
     23                skinname = "panel_system_update_flash_online_menu";
    2424                filemask = ostrcat(filemask, "*.img", 1, 0);
    2525                filepath = ostrcat(filepath, "/tmp/online", 1, 0);
    2626                type = ostrcat(type, "online", 1, 0);
    2727        } else if (mode == 1){
    28                 skinname = "aafpanel_system_update_flash_tmp_menu";
     28                skinname = "panel_system_update_flash_tmp_menu";
    2929                filemask = ostrcat(filemask, "*.img", 1, 0);
    3030                filepath = ostrcat(filepath, "/tmp", 1, 0);
     
    3232        } else if (mode == 2){
    3333                system("/sbin/update.sh getfilelist");
    34                 skinname = "aafpanel_system_update_usb_online_menu";
     34                skinname = "panel_system_update_usb_online_menu";
    3535                filemask = ostrcat(filemask, "*.tar.gz", 1, 0);
    3636                filepath = ostrcat(filepath, "/tmp/online", 1, 0);
    3737                type = ostrcat(type, "online", 1, 0);
    3838        } else if (mode == 3){
    39                 skinname = "aafpanel_system_update_usb_tmp_menu";
     39                skinname = "panel_system_update_usb_tmp_menu";
    4040                filemask = ostrcat(filemask, "*.tar.gz", 1, 0);
    4141                filepath = ostrcat(filepath, "/tmp", 1, 0);
     
    4343        }
    4444
    45         aafpanel_system = getscreen(skinname);
    46         struct skin* filelistpath = getscreennode(aafpanel_system, "aafpanel_filelistpath");
    47         struct skin* filelist = getscreennode(aafpanel_system, "aafpanel_filelist");
    48 
    49         struct skin* device = getscreennode(aafpanel_system, "device");
     45        panel_system = getscreen(skinname);
     46        struct skin* filelistpath = getscreennode(panel_system, "panel_filelistpath");
     47        struct skin* filelist = getscreennode(panel_system, "panel_filelist");
     48
     49        struct skin* device = getscreennode(panel_system, "device");
    5050
    5151        if (mode == 2 || mode == 3){
     
    109109        setchoiceboxselection(device, getconfig("device", NULL));
    110110
    111         getfilelist(aafpanel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
    112         addscreenrc(aafpanel_system, filelist);
     111        getfilelist(panel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
     112        addscreenrc(panel_system, filelist);
    113113        if(mode == 2 || mode == 3)
    114114        {
    115                 delrc(getrcconfigint("rcright", NULL), aafpanel_system, filelist);
    116                 delrc(getrcconfigint("rcleft", NULL), aafpanel_system, filelist);
    117                 addscreenrc(aafpanel_system, device);
     115                delrc(getrcconfigint("rcright", NULL), panel_system, filelist);
     116                delrc(getrcconfigint("rcleft", NULL), panel_system, filelist);
     117                addscreenrc(panel_system, device);
    118118        }
    119119
    120120        while(1)
    121121        {
    122                 rcret = waitrc(aafpanel_system, 0, 0);
    123                 debug(40, "[aafpanel_system] while status");
     122                rcret = waitrc(panel_system, 0, 0);
     123                debug(40, "[panel_system] while status");
    124124
    125125
     
    130130                                system("/sbin/update.sh getfilelist");
    131131                        }
    132                         drawscreen(aafpanel_system, 0);
    133                         getfilelist(aafpanel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
    134                         addscreenrc(aafpanel_system, filelist);
     132                        drawscreen(panel_system, 0);
     133                        getfilelist(panel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
     134                        addscreenrc(panel_system, filelist);
    135135                        continue;
    136136                } else if(rcret == getrcconfigint("rcok", NULL) || rcret == getrcconfigint("rcgreen", NULL)){
     
    139139                        } else if(filelist->select != NULL && filelist->select->input == NULL){
    140140                                tmpstr = createpath(filelistpath->text, filelist->select->text);
    141                                 debug(40, "[aafpanel_system] tmpstr: %s", tmpstr);
     141                                debug(40, "[panel_system] tmpstr: %s", tmpstr);
    142142
    143143                                char* cmd = NULL;
     
    149149
    150150                                if(file_exist("/tmp/.swapextensionsdev")){
    151                                         printf("[AafPanel] Update: update with log\n");
     151                                        printf("[Panel] Update: update with log\n");
    152152                                        if(string_find("_KERNEL_",filelist->select->text)){
    153153                                                cmd = ostrcat(cmd, "kernel ", 1, 0);
     
    191191                                        }
    192192                                } else {
    193                                         printf("[AafPanel] Update: update without log\n");
     193                                        printf("[Panel] Update: update without log\n");
    194194
    195195                                        if(string_find("_KERNEL_",filelist->select->text)){
     
    227227                                        }
    228228                                }
    229                                 clearscreen(aafpanel_system);
     229                                clearscreen(panel_system);
    230230                                if(msgtxt == NULL){
    231231                                        textbox(_("Message"), _("Error file not supported"), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
    232                                         drawscreen(aafpanel_system, 0);
    233                                         getfilelist(aafpanel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
    234                                         addscreenrc(aafpanel_system, filelist);
     232                                        drawscreen(panel_system, 0);
     233                                        getfilelist(panel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
     234                                        addscreenrc(panel_system, filelist);
    235235                                        continue;
    236236                                }
    237237
    238238                                if(textbox(_("Message"), _(msgtxt), _("EXIT"), getrcconfigint("rcexit", NULL), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 2){
    239                                         debug(40, "[aafpanel_system] update started cmd: %s", cmd);
     239                                        debug(40, "[panel_system] update started cmd: %s", cmd);
    240240                                        system(cmd);
    241241                                } else {
    242                                         debug(40, "[aafpanel_system] update canceled cmd: %s", cmd);
    243                                         drawscreen(aafpanel_system, 0);
    244                                         getfilelist(aafpanel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
    245                                         addscreenrc(aafpanel_system, filelist);
     242                                        debug(40, "[panel_system] update canceled cmd: %s", cmd);
     243                                        drawscreen(panel_system, 0);
     244                                        getfilelist(panel_system, filelistpath, filelist, filepath, filemask, 1, NULL);
     245                                        addscreenrc(panel_system, filelist);
    246246                                        continue;
    247247                                }
     
    254254                }
    255255        }
    256         delownerrc(aafpanel_system);
    257         clearscreen(aafpanel_system);
    258 
    259         delownerrc(aafpanel_system);
    260         clearscreen(aafpanel_system);
     256        delownerrc(panel_system);
     257        clearscreen(panel_system);
     258
     259        delownerrc(panel_system);
     260        clearscreen(panel_system);
    261261
    262262        status.hangtime = getconfigint("hangtime", NULL);
    263         debug(40, "[screenaafpanel_system_update] closed:");
     263        debug(40, "[screenpanel_system_update] closed:");
    264264}
    265265
  • titan/plugins/panel/panel_system_backup.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SYSTEM_BACKUP_H
    2 #define AAFPANEL_SYSTEM_BACKUP_H
     1#ifndef PANEL_SYSTEM_BACKUP_H
     2#define PANEL_SYSTEM_BACKUP_H
    33
    4 void screenaafpanel_system_backup()
     4void screenpanel_system_backup()
    55{
    66        int rcret = 0;
    7         struct skin* aaf_backup = getscreen("aafpanel_system_backup");
    8         struct skin* listbox = getscreennode(aaf_backup, "listbox");
    9         struct skin *listfield = getscreennode(aaf_backup, "listfield");
    10         struct skin* b_red = getscreennode(aaf_backup, "b1");
    11         struct skin* b_green = getscreennode(aaf_backup, "b2");
    12         struct skin* info = getscreennode(aaf_backup, "info");
     7        struct skin* panel_backup = getscreen("panel_system_backup");
     8        struct skin* listbox = getscreennode(panel_backup, "listbox");
     9        struct skin *listfield = getscreennode(panel_backup, "listfield");
     10        struct skin* b_red = getscreennode(panel_backup, "b1");
     11        struct skin* b_green = getscreennode(panel_backup, "b2");
     12        struct skin* info = getscreennode(panel_backup, "info");
    1313        struct skin* tmp = NULL;
    1414        char* tmpstr = NULL, *infotext = NULL;
     
    2121        b_red->hidden = NO; b_green->hidden = NO;
    2222
    23         changetitle(aaf_backup, _("Create Backup"));
     23        changetitle(panel_backup, _("Create Backup"));
    2424
    25         addscreenrc(aaf_backup, listbox);
     25        addscreenrc(panel_backup, listbox);
    2626
    2727        if(checkbox("UFS912") || checkbox("AT7500"))
     
    3434        }
    3535
    36         drawscreen(aaf_backup, 0);
     36        drawscreen(panel_backup, 0);
    3737        tmp = listbox->select;
    3838
    3939        while(1)
    4040        {
    41                 addscreenrc(aaf_backup, tmp);
    42                 rcret = waitrc(aaf_backup, 0, 0);
     41                addscreenrc(panel_backup, tmp);
     42                rcret = waitrc(panel_backup, 0, 0);
    4343                tmp = listbox->select;
    4444
     
    5656                        {
    5757                                b_red->hidden = YES; b_green->hidden = YES;
    58                                 drawscreen(aaf_backup, 0);
     58                                drawscreen(panel_backup, 0);
    5959                                tmpstr = ostrcat(tmpstr, "backup.sh ", 1, 0);
    6060                                tmpstr = ostrcat(tmpstr, getownconfig(listbox->select->name), 1, 0);
     
    6767
    6868        infotext = NULL;
    69         delownerrc(aaf_backup);
    70         clearscreen(aaf_backup);
     69        delownerrc(panel_backup);
     70        clearscreen(panel_backup);
    7171}
    7272
  • titan/plugins/panel/panel_system_restore.h

    r11416 r11419  
    1 #ifndef AAFPANEL_SYSTEM_RESTORE_H
    2 #define AAFPANEL_SYSTEM_RESTORE_H
     1#ifndef PANEL_SYSTEM_RESTORE_H
     2#define PANEL_SYSTEM_RESTORE_H
    33
    4 void screenaafpanel_system_restore()
     4void screenpanel_system_restore()
    55{
    66        int rcret = 0;
    7         struct skin* aaf_restore = getscreen("aafpanel_system_restore");
    8         struct skin* b_red = getscreennode(aaf_restore, "b1");
    9         struct skin* b_green = getscreennode(aaf_restore, "b2");
    10         struct skin* b_yellow = getscreennode(aaf_restore, "b3");
    11         struct skin* info = getscreennode(aaf_restore, "info");
     7        struct skin* panel_restore = getscreen("panel_system_restore");
     8        struct skin* b_red = getscreennode(panel_restore, "b1");
     9        struct skin* b_green = getscreennode(panel_restore, "b2");
     10        struct skin* b_yellow = getscreennode(panel_restore, "b3");
     11        struct skin* info = getscreennode(panel_restore, "info");
    1212        char* tmpstr = NULL, *infotext = NULL;
    1313
    14         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!";
     14        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!";
    1515
    1616        changetext(info, _(infotext));
    17         changetitle(aaf_restore, _("Backup / Restore Settings"));
     17        changetitle(panel_restore, _("Backup / Restore Settings"));
    1818
    19         drawscreen(aaf_restore, 0);
     19        drawscreen(panel_restore, 0);
    2020
    2121        while(1)
    2222        {
    23                 rcret = waitrc(aaf_restore, 0, 0);
     23                rcret = waitrc(panel_restore, 0, 0);
    2424
    2525                if(rcret == getrcconfigint("rcexit", NULL)) break;
     
    2828                if(rcret == getrcconfigint("rcgreen", NULL))
    2929                {
    30                         clearscreen(aaf_restore);
     30                        clearscreen(panel_restore);
    3131                        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)
    3232                        {
     
    4444                                else
    4545                                {
    46                                         //clearscreen(aaf_restore);
     46                                        //clearscreen(panel_restore);
    4747                                        textbox(_("RESTORE ERROR"), _("No backup folders found!!!\n\nAborting restoring..."), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
    48                                         drawscreen(aaf_restore, 0);
     48                                        drawscreen(panel_restore, 0);
    4949                                }
    5050                        }else
    5151                        {
    52                                 drawscreen(aaf_restore, 0);
     52                                drawscreen(panel_restore, 0);
    5353                        }
    5454                }
     
    5757                        if(isfile("/tmp/.backupdev"))
    5858                        {
    59                                 changetitle(aaf_restore, _("Backup - Settings"));
     59                                changetitle(panel_restore, _("Backup - Settings"));
    6060                                changetext(info, _("Backup started\n\nPlease wait..."));
    6161                                info->textposx = 50;
    6262                                b_red->hidden = YES; b_green->hidden = YES; b_yellow->hidden = YES;
    63                                 drawscreen(aaf_restore, 0);
     63                                drawscreen(panel_restore, 0);
    6464
    6565                                writeallconfig(1);
     
    6767                                free(tmpstr); tmpstr = NULL;
    6868
    69                                 changetitle(aaf_restore, _("Backup / Restore Settings"));
     69                                changetitle(panel_restore, _("Backup / Restore Settings"));
    7070                                changetext(info, _(infotext));
    7171                                info->textposx = 0;
    7272                                b_red->hidden = NO; b_green->hidden = NO; b_yellow->hidden = NO;
    73                                 drawscreen(aaf_restore, 0);
     73                                drawscreen(panel_restore, 0);
    7474                        }
    7575                        else
    7676                        {
    77                                 clearscreen(aaf_restore);
     77                                clearscreen(panel_restore);
    7878                                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);
    79                                 drawscreen(aaf_restore, 0);
     79                                drawscreen(panel_restore, 0);
    8080                        }
    8181                }
     
    8383
    8484        infotext = NULL;
    85         delownerrc(aaf_restore);
    86         clearscreen(aaf_restore);
     85        delownerrc(panel_restore);
     86        clearscreen(panel_restore);
    8787}
    8888#endif
Note: See TracChangeset for help on using the changeset viewer.