Changeset 18991


Ignore:
Timestamp:
12/08/12 10:22:29 (10 years ago)
Author:
nit
Message:

[titan] update mediadbedit

Location:
titan
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • titan/plugins/tmc/tmc.h

    r18947 r18991  
    886886                {
    887887                        if(ostrcmp(listbox->select->name, "edit") == 0)
    888                                 screenmediadbedit(file, menuid);
     888                                screenmediadbedit(file, menuid, 1);
    889889                        if(ostrcmp(listbox->select->name, "delete") == 0)
    890890                        {

  • titan/skins/tmc/skin.xml

    r16853 r18991  
    7979</screen>
    8080
    81 <screen valign=bottom fontcol=fontcol fontsize=20 titlealign=center name="tmcedit" hspace=10 vspace=10 posx=center posy=center width=70% height=70% bordercol=bordercol bordersize=2 bgcol=bgcol>
    82 <node fontsize=30 bordercol=titlebgcol scrollbar=auto type=listbox name=listbox posy=1 width=100% height=-35>
    83 <node name=title text="Title" parent=listbox type=inputbox width=100% height=30>
    84 <node name=year text="Year" parent=listbox type=inputboxnum width=100% height=30>
    85 <node name=released text="Released" parent=listbox type=inputbox width=100% height=30>
    86 <node name=runtime text="Runtime" parent=listbox type=inputbox width=100% height=30>
    87 <node name=genre text="Genre" parent=listbox type=inputbox width=100% height=30>
    88 <node name=director text="Director" parent=listbox type=inputbox width=100% height=30>
    89 <node name=writer text="Writer" parent=listbox type=inputbox width=100% height=30>
    90 <node name=actors text="Actors" parent=listbox type=inputbox width=100% height=30>
    91 <node name=plot text="Plot" parent=listbox type=inputbox width=100% height=30>
    92 <node name=rating text="Rating" parent=listbox type=choicebox width=100% height=30>
    93 <node name=votes text="Votes" parent=listbox type=inputboxnum width=100% height=30>
    94 <node name=locked text="Scan locking" parent=listbox type=choicebox width=100% height=30>
    95 <node name=picture text="Picture" parent=listbox type=choicebox width=100% height=30>
    96 <node name=b1 text="OK" halign=center valign=center bordercol=okcol bordersize=6 bordertype=2 posx=20 posy=0 width=150 height=39/>
    97 <node name=b2 text="PICTURE" halign=center valign=center bordercol=red bordersize=6 bordertype=2 posx=180 posy=0 width=150 height=39/>
    98 </screen>
    99 
    10081<screen fontcol=fontcol fontsize=20 titlealign=center name="tmcepg" title="EPG Info" hspace=10 vspace=10 posx=center posy=center width=60% height=60% bordercol=bordercol bordersize=2 bgcol=bgcol>
    10182</screen>

  • titan/titan/header.h

    r18987 r18991  
    1010
    1111//mediadbedit.h
    12 void screenmediadbedit(char* file, int menuid);
     12void screenmediadbedit(char* file, int id, int flag);
    1313
    1414//shortepg.h

  • titan/titan/mediadbedit.h

    r18954 r18991  
    22#define MEDIADBEDIT_H
    33
    4 void screenmediadbedit(char* file, int menuid)
     4//flag 0: don't save/restore background
     5//flag 1: save/restore background
     6void screenmediadbedit(char* file, int id, int flag)
    57{
    68        int rcret = 0, type = 0, i = 0;
    7         struct skin* tmcedit = getscreen("mediadbedit");
    8         struct skin* listbox = getscreennode(tmcedit, "listbox");
    9         struct skin* title = getscreennode(tmcedit, "title");
    10         struct skin* year = getscreennode(tmcedit, "year");
    11         struct skin* released = getscreennode(tmcedit, "released");
    12         struct skin* runtime = getscreennode(tmcedit, "runtime");
    13         struct skin* genre = getscreennode(tmcedit, "genre");
    14         struct skin* director = getscreennode(tmcedit, "director");
    15         struct skin* writer = getscreennode(tmcedit, "writer");
    16         struct skin* actors = getscreennode(tmcedit, "actors");
    17         struct skin* plot = getscreennode(tmcedit, "plot");
    18         struct skin* rating = getscreennode(tmcedit, "rating");
    19         struct skin* votes = getscreennode(tmcedit, "votes");
    20         struct skin* locked = getscreennode(tmcedit, "locked");
    21         struct skin* picture = getscreennode(tmcedit, "picture");
    22         struct skin* shortname = getscreennode(tmcedit, "shortname");
    23         struct skin* fileinfo = getscreennode(tmcedit, "fileinfo");
     9        struct skin* mediadbedit = getscreen("mediadbedit");
     10        struct skin* listbox = getscreennode(mediadbedit, "listbox");
     11        struct skin* title = getscreennode(mediadbedit, "title");
     12        struct skin* year = getscreennode(mediadbedit, "year");
     13        struct skin* released = getscreennode(mediadbedit, "released");
     14        struct skin* runtime = getscreennode(mediadbedit, "runtime");
     15        struct skin* genre = getscreennode(mediadbedit, "genre");
     16        struct skin* director = getscreennode(mediadbedit, "director");
     17        struct skin* writer = getscreennode(mediadbedit, "writer");
     18        struct skin* actors = getscreennode(mediadbedit, "actors");
     19        struct skin* plot = getscreennode(mediadbedit, "plot");
     20        struct skin* rating = getscreennode(mediadbedit, "rating");
     21        struct skin* votes = getscreennode(mediadbedit, "votes");
     22        struct skin* locked = getscreennode(mediadbedit, "locked");
     23        struct skin* picture = getscreennode(mediadbedit, "picture");
     24        struct skin* shortname = getscreennode(mediadbedit, "shortname");
     25        struct skin* fileinfo = getscreennode(mediadbedit, "fileinfo");
    2426        struct skin* tmp = NULL;
    2527        struct skin* load = getscreen("loading");
    … …  
    3537        }
    3638
    37         if(menuid == 3) type = 0; //video
    38         if(menuid == 4) type = 1; //audio
    39         if(menuid == 2) type = 2; //picture
     39        if(id == 3) type = 0; //video
     40        if(id == 4) type = 1; //audio
     41        if(id == 2) type = 2; //picture
    4042
    4143        if(node != NULL)
    … …  
    9193                        setchoiceboxselection(locked, "0");
    9294
    93                 drawscreen(tmcedit, 2, 0);
    94                 bg = savescreen(tmcedit);
    95 
    96                 addscreenrc(tmcedit, listbox);
    97                 drawscreen(tmcedit, 0, 0);
     95                if(flag == 1)
     96                {
     97                        drawscreen(mediadbedit, 2, 0);
     98                        bg = savescreen(mediadbedit);
     99                }
     100
     101                addscreenrc(mediadbedit, listbox);
     102                drawscreen(mediadbedit, 0, 0);
    98103
    99104                tmp = listbox->select;
    100105                while(1)
    101106                {
    102                         addscreenrc(tmcedit, tmp);
    103                         rcret = waitrcext(tmcedit, 0, 0, 1000);
    104                         delownerrc(tmcedit);
    105                         addscreenrc(tmcedit, listbox);
     107                        addscreenrc(mediadbedit, tmp);
     108                        rcret = waitrcext(mediadbedit, 0, 0, 1000);
     109                        delownerrc(mediadbedit);
     110                        addscreenrc(mediadbedit, listbox);
    106111                        tmp = listbox->select;
    107112
    … …  
    312317                        {
    313318                                free(picret); picret = NULL;
    314                                 picret = screendir(getconfig("mediadbpath", NULL), "*.jpg", NULL, NULL, NULL, NULL, 0, "SELECT", 0, NULL, 0, NULL, 0, tmcedit->width, tmcedit->prozwidth, tmcedit->height, tmcedit->prozheight, 0);
     319                                picret = screendir(getconfig("mediadbpath", NULL), "*.jpg", NULL, NULL, NULL, NULL, 0, "SELECT", 0, NULL, 0, NULL, 0, mediadbedit->width, mediadbedit->prozwidth, mediadbedit->height, mediadbedit->prozheight, 0);
    315320                                if(picret != NULL)
    316321                                        changeinput(picture, basename(picret));
    317                                 drawscreen(tmcedit, 0, 0);
     322                                drawscreen(mediadbedit, 0, 0);
    318323                        }
    319324                }
    320325
    321326                free(picret); picret = NULL;
    322                 delownerrc(tmcedit);
    323                 clearscreen(tmcedit);
    324                 restorescreen(bg, tmcedit);
    325                 blitfb(0);
     327                delownerrc(mediadbedit);
     328                clearscreen(mediadbedit);
     329
     330                if(flag == 1)
     331                {
     332                        restorescreen(bg, mediadbedit);
     333                        blitfb(0);
     334                }
    326335        }
    327336}

  • titan/titan/play.h

    r18973 r18991  
    567567                        get_mediadb_scan_info();
    568568                else if(ostrcmp(mbox->name, "MediaDB Edit") == 0)
    569                         screenmediadbedit(file, 0);
     569                        screenmediadbedit(file, 0, 0);
    570570                else
    571571                {
Note: See TracChangeset for help on using the changeset viewer.