--- np2/win9x/toolwin.res 2003/10/29 21:35:58 1.2 +++ np2/win9x/toolwin.res 2003/10/30 16:54:04 1.3 @@ -5,28 +5,25 @@ static const char np2tooltitle[] = "NP2 static const char str_deffont[] = "£Í£Ó £Ð¥´¥·¥Ã¥¯"; static const char str_browse[] = "..."; static const char str_eject[] = "Eject"; +static const char str_reset[] = "Reset"; +static const char str_power[] = "Power"; static const char str_static[] = "STATIC"; static const char str_combobox[] = "COMBOBOX"; static const char str_button[] = "BUTTON"; static const SUBITEM defsubitem[IDC_MAXITEMS] = { - {str_static, NULL, WS_VISIBLE, 47, 44, 8, 3, FALSE}, - {str_static, NULL, WS_VISIBLE, 93, 19, 8, 3, FALSE}, - {str_combobox, NULL, WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL, - 104, 6, 248, 160, TRUE}, - {str_button, str_browse, WS_VISIBLE | BS_PUSHBUTTON, - 352, 7, 18, 17, TRUE}, - {str_button, str_eject, WS_VISIBLE | BS_PUSHBUTTON, - 370, 7, 34, 17, TRUE}, - {str_static, NULL, WS_VISIBLE, 93, 41, 8, 3, FALSE}, - {str_combobox, NULL, WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL, - 104, 28, 248, 160, TRUE}, - {str_button, str_browse, WS_VISIBLE | BS_PUSHBUTTON, - 352, 29, 18, 17, TRUE}, - {str_button, str_eject, WS_VISIBLE | BS_PUSHBUTTON, - 370, 29, 34, 17, TRUE}}; - + {TCTL_STATIC, NULL, 47, 44, 8, 3, 0, 0}, + {TCTL_STATIC, NULL, 93, 19, 8, 3, 0, 0}, + {TCTL_DDLIST, NULL, 104, 6, 248, 160, 0, 0}, + {TCTL_BUTTON, str_browse, 352, 7, 18, 17, 0, 0}, + {TCTL_BUTTON, str_eject, 370, 7, 34, 17, 0, 0}, + {TCTL_STATIC, NULL, 93, 41, 8, 3, 0, 0}, + {TCTL_DDLIST, NULL, 104, 28, 248, 160, 0, 0}, + {TCTL_BUTTON, str_browse, 352, 29, 18, 17, 0, 0}, + {TCTL_BUTTON, str_eject, 370, 29, 34, 17, 0, 0}, + {TCTL_BUTTON, str_reset, 0, 0, 0, 0, 0, 0}, + {TCTL_BUTTON, str_power, 0, 0, 0, 0, 0, 0}}; // ---- @@ -38,15 +35,17 @@ static const INITBL skinini[] = { {"FONTSIZE", INITYPE_SINT32, &toolskin.fontsize, 0}, {"COLOR1", INITYPE_HEX32, &toolskin.color1, 0}, {"COLOR2", INITYPE_HEX32, &toolskin.color2, 0}, - {"HDDACC", INITYPE_ARGS16, &subitem[IDC_TOOLHDDACC].posx, 4}, - {"FD1ACC", INITYPE_ARGS16, &subitem[IDC_TOOLFDD1ACC].posx, 4}, - {"FD1LIST", INITYPE_ARGS16, &subitem[IDC_TOOLFDD1LIST].posx, 4}, - {"FD1BROWSE", INITYPE_ARGS16, &subitem[IDC_TOOLFDD1BROWSE].posx, 4}, - {"FD1EJECT", INITYPE_ARGS16, &subitem[IDC_TOOLFDD1EJECT].posx, 4}, - {"FD2ACC", INITYPE_ARGS16, &subitem[IDC_TOOLFDD2ACC].posx, 4}, - {"FD2LIST", INITYPE_ARGS16, &subitem[IDC_TOOLFDD2LIST].posx, 4}, - {"FD2BROWSE", INITYPE_ARGS16, &subitem[IDC_TOOLFDD2BROWSE].posx, 4}, - {"FD2EJECT", INITYPE_ARGS16, &subitem[IDC_TOOLFDD2EJECT].posx, 4}}; + {"HDDACC", INITYPE_ARGS16, &subitem[IDC_TOOLHDDACC].posx, 5}, + {"FD1ACC", INITYPE_ARGS16, &subitem[IDC_TOOLFDD1ACC].posx, 5}, + {"FD1LIST", INITYPE_ARGS16, &subitem[IDC_TOOLFDD1LIST].posx, 5}, + {"FD1BROWSE", INITYPE_ARGS16, &subitem[IDC_TOOLFDD1BROWSE].posx, 5}, + {"FD1EJECT", INITYPE_ARGS16, &subitem[IDC_TOOLFDD1EJECT].posx, 5}, + {"FD2ACC", INITYPE_ARGS16, &subitem[IDC_TOOLFDD2ACC].posx, 5}, + {"FD2LIST", INITYPE_ARGS16, &subitem[IDC_TOOLFDD2LIST].posx, 5}, + {"FD2BROWSE", INITYPE_ARGS16, &subitem[IDC_TOOLFDD2BROWSE].posx, 5}, + {"FD2EJECT", INITYPE_ARGS16, &subitem[IDC_TOOLFDD2EJECT].posx, 5}, + {"RESETBTN", INITYPE_ARGS16, &subitem[IDC_TOOLRESET].posx, 5}, + {"POWERBTN", INITYPE_ARGS16, &subitem[IDC_TOOLPOWER].posx, 5}}; // static const DWORD mvccol[MVC_MAXCOLOR] = {