From ae302d80183ccba0247dd3bbec7da39d891e6c93 Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Wed, 28 Dec 2011 03:25:09 +0900 Subject: [PATCH] 2011/12/28 3:25:09 --- nlite.suo | Bin 147456 -> 147456 bytes nlite/bk/nlite.rc | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++ nlite/nlite.rc | 147 +------------------------- nlite/nlite_include.h | 1 - 4 files changed, 283 insertions(+), 147 deletions(-) create mode 100644 nlite/bk/nlite.rc diff --git a/nlite.suo b/nlite.suo index 97c4b756b12368eaae2251fbc6f227d066a3cdb4..5e88b78222c75089449f6eb48b527d440c4f05f3 100644 GIT binary patch delta 1327 zcmY*YYfO_@82+9^Z3}eeVh7Y4h>T$6QVDPzFO8{MJTNu4gP!>w625BV~&Lhx}FCW^CTy=jZKc4`qudc{}L@m2WycIHAHiUZq&j` z?HkcdY6%kPNT1v^QEDgFmY|sVijg8xN-+k0E|@|cEm8*CjLlaD6FT`7%T}S5VXro3 zQ?9YCXJ6{>o@?znG37_+6n^`mnQXh|E~YYR)|fkzBJJ2IR686j`p3S3pZ}N{ICrEw zdS&Tf6Wc}Zi@1R$o`&W+57}!?-iZ)*O$(vMo2+OJ4ju_v5*y!#EOu|+nE2W+t zSRvZBp*4(ht|6Cxt3;3F&A&3_Df#!ysIT@gC@hS|o>< z;zWKEM!~0^FQEtr(uDImI<+)(6K2Y&z*5>cgl{6YxQ;oU1@pXf0?&w)VT^?_rHEeWw=?<_vn`KM%;+?ztWNPmD4 z_#+tO6KhIEX%M~e6|f|cWMtz}AE}#|#-A*qXR@oZpbFK%Z17u{fp$%zT$Hb37vaxm G`hNfwu+xVC delta 1320 zcmY*Xe{54#6n@`rS-Vk3$HrJ?%>5`Zy3w>CSRsrzwt&jOq74cT7;85fbS;!_l*EJ* ziHwAp$;F<32q80RbQnP@yAlXKh~V%ys2I(HqJbzufn^R-#_+!J!+4VW-aYS~``z<> z=ZnWPgE&QGxO&WM|@94h1Ch@JQT zW>0C6cz{Zl;|ZGQLrE(BqdJ-g)9T^h)$#PEjXC+x>B+n`oU21m;h}Uke`d(ubq7@9 zgNMB9kV(_(Fpspw=uSEAc4t%!>#fPSExWrTmkEk;SLQ=nl*U*8h)2ipQo2_J$YUWY_R&Nb7j=j}%t&wf!uZAZIGzEb$5 zJ2p~Zlvf0O@FkW*)nzEl3|o@ahBc+~|K-FRQtKHEE|Mp7%0rWIKmkB>72)Dz>e_R#D#k-oNm-gRd21q7O}S((;>Tiq=%%xeH{!)2Eb^?dTh}LNyX3VV~FC4E>|?U zR{mSM665JuEoM^jb>v&7Nx|<&g(e!#U^fy$^zx2VF`>3X%b=yl;Sr8rTtH7B`q2|Z zuY+5kt`q}Z@QyWqC=VZ$OZO;6kH9-(z@rboh=C)pNQ~>)PL)w)iTG7S&~pNs$skMU z-Vc~d2mitfQFjeV!|sY&$_hx%!OyWLgEyoL>E#P3Cigjfn)p~B=6UoP_?1vh#4cdx zD4Ko-($a0Ph>{yPhr~g><|6i+%^yhk^N+f?0*iqf{MfJS=n|*;Q3YyfMtDR79l>g} z=nc7tuvFY0f*Hv)jQs0~St2Wg4WefN9#-(SEYTgDC!PAx&3aDWK@_|du!`6qI*>Fo zM(t)+CoCTJk%9Lws^yM?v0~XUx=lix!&D~J$xK5si!r`?(tOHFO9o5I*l>4tC1GAj!z;YA*dZiKnUUv2CQ+ynrZJ%we|T9-pebD47F~PaDOEa+aX3xC+{6;P zydD#z1*XxO&3FZ${qJKwcP)4qz|s5|Z;iesfEhyPBLPMKMaQ3T>^# zM8Ol*m&U0+j+J +#include +#include +#include "resource.h" + + + + +// +// Toolbar resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDC_NLITE TOOLBAR 16, 15 +{ + BUTTON IDR_COMMAND3 + BUTTON IDR_COMMAND4 + BUTTON IDR_COMMAND5 + BUTTON IDR_COMMAND2 + BUTTON IDR_COMMAND1 + BUTTON IDR_COMMAND6 +} + + + +// +// Bitmap resources +// +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +IDC_NLITE BITMAP "toolbar1.bmp" + + + +// +// Menu resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDC_NLITE MENU +{ + POPUP "ƒtƒ@ƒCƒ‹(&F)" + { + MENUITEM "ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̏I—¹(&X)", IDM_EXIT + } + POPUP "Ý’è(&T)" + { + MENUITEM "ƒNƒbƒL[‚̐ݒè(&B)", IDM_COOKIE + } + POPUP "ƒwƒ‹ƒv(&H)" + { + MENUITEM "ƒo[ƒWƒ‡ƒ“î•ñ(&A)...", IDM_ABOUT + } +} + + + +// +// Dialog resources +// +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +IDD_DIALOG_BROWSERTYPE DIALOG 0, 0, 123, 110 +STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU +CAPTION "ƒNƒbƒL[‚̐ݒè" +FONT 8, "Ms Shell Dlg" +{ + AUTORADIOBUTTON "IE", IDC_RADIO_IE, 30, 29, 22, 8 + AUTORADIOBUTTON "FireFox", IDC_RADIO_FIREFOX, 30, 45, 39, 8 + AUTORADIOBUTTON "GoogleChrome", IDC_RADIO_CHROME, 30, 61, 62, 8 + AUTORADIOBUTTON "IEƒRƒ“ƒ|[ƒlƒ“ƒg", IDC_RADIO_IECM, 30, 76, 61, 8 + PUSHBUTTON "OK", IDC_BUTTON_COOKIE_OK, 21, 91, 38, 14 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 63, 91, 33, 14 + LTEXT "•’iŽg—p‚µ‚Ä‚¢‚éƒuƒ‰ƒEƒU‚ðŽw’肵‚Ä‚­‚¾‚³‚¢", IDC_STATIC, 21, 6, 82, 22, SS_LEFT +} + + + +// +// String Table resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +STRINGTABLE +{ + IDC_NLITE "nlite" +} + + + +// +// Accelerator resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDC_NLITE ACCELERATORS +{ + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +} + + + +// +// Icon resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDI_NLITE ICON "nlite.ico" + + +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDI_SMALL ICON "small.ico" + + + +// +// Version Information resources +// +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +1 VERSIONINFO + FILEVERSION 0,0,0,1 + PRODUCTVERSION 0,0,0,1 + FILEOS VOS_NT + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN + FILEFLAGSMASK 0x00000000 + FILEFLAGS 0x00000000 +{ + BLOCK "StringFileInfo" + { + BLOCK "08000025" + { + VALUE "LegalCopyright", "Copyright (C) 2011 Kohsuke Oikawa." + VALUE "OriginalFilename", "nlite.exe" + VALUE "ProductName", "nlite" + VALUE "ProductVersion", "0.001" + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x0800, 0x0025 + } +} +======= +// Generated by ResEdit 1.5.8 +// Copyright (C) 2006-2011 +// http://www.resedit.net + +#include +#include +#include +#include "resource.h" + + + + +// +// Toolbar resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDC_NLITE TOOLBAR 16, 15 +{ + BUTTON IDR_COMMAND3 + BUTTON IDR_COMMAND4 + BUTTON IDR_COMMAND5 + BUTTON IDR_COMMAND2 + BUTTON IDR_COMMAND1 + BUTTON IDR_COMMAND6 +} + + + +// +// Bitmap resources +// +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +IDC_NLITE BITMAP "toolbar1.bmp" + + + +// +// Menu resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDC_NLITE MENU +{ + POPUP "ƒtƒ@ƒCƒ‹(&F)" + { + MENUITEM "ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̏I—¹(&X)", IDM_EXIT + } + POPUP "Ý’è(&T)" + { + MENUITEM "ƒNƒbƒL[‚̐ݒè(&B)", IDM_COOKIE + } + POPUP "ƒwƒ‹ƒv(&H)" + { + MENUITEM "ƒo[ƒWƒ‡ƒ“î•ñ(&A)...", IDM_ABOUT + } +} + + + +// +// Dialog resources +// +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +IDD_DIALOG_BROWSERTYPE DIALOG 0, 0, 123, 110 +STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU +CAPTION "ƒNƒbƒL[‚̐ݒè" +FONT 8, "Ms Shell Dlg" +{ + AUTORADIOBUTTON "IE", IDC_RADIO_IE, 30, 29, 22, 8 + AUTORADIOBUTTON "FireFox", IDC_RADIO_FIREFOX, 30, 45, 39, 8 + AUTORADIOBUTTON "GoogleChrome", IDC_RADIO_CHROME, 30, 61, 62, 8 + AUTORADIOBUTTON "IEƒRƒ“ƒ|[ƒlƒ“ƒg", IDC_RADIO_IECM, 30, 76, 61, 8 + PUSHBUTTON "OK", IDC_BUTTON_COOKIE_OK, 21, 91, 38, 14 + PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 63, 91, 33, 14 + LTEXT "•’iŽg—p‚µ‚Ä‚¢‚éƒuƒ‰ƒEƒU‚ðŽw’肵‚Ä‚­‚¾‚³‚¢", IDC_STATIC, 21, 6, 82, 22, SS_LEFT +} + + + +// +// String Table resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +STRINGTABLE +{ + IDC_NLITE "nlite" +} + + + +// +// Accelerator resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDC_NLITE ACCELERATORS +{ + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +} + + + +// +// Icon resources +// +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDI_NLITE ICON "nlite.ico" + + +LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN +IDI_SMALL ICON "small.ico" + + + +// +// Version Information resources +// +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +1 VERSIONINFO + FILEVERSION 0,0,0,1 + PRODUCTVERSION 0,0,0,1 + FILEOS VOS_NT + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN + FILEFLAGSMASK 0x00000000 + FILEFLAGS 0x00000000 +{ + BLOCK "StringFileInfo" + { + BLOCK "08000025" + { + VALUE "LegalCopyright", "Copyright (C) 2011 Kohsuke Oikawa." + VALUE "OriginalFilename", "nlite.exe" + VALUE "ProductName", "nlite" + VALUE "ProductVersion", "0.001" + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x0800, 0x0025 + } +} +>>>>>>> 430d860a415ba52ccec373d48eb89911e3ad6a51 diff --git a/nlite/nlite.rc b/nlite/nlite.rc index 43a4a45..9e25bee 100644 --- a/nlite/nlite.rc +++ b/nlite/nlite.rc @@ -1,150 +1,5 @@ -<<<<<<< HEAD -// Generated by ResEdit 1.5.8 -// Copyright (C) 2006-2011 -// http://www.resedit.net - -#include -#include -#include -#include "resource.h" - - - - -// -// Toolbar resources -// -LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN -IDC_NLITE TOOLBAR 16, 15 -{ - BUTTON IDR_COMMAND3 - BUTTON IDR_COMMAND4 - BUTTON IDR_COMMAND5 - BUTTON IDR_COMMAND2 - BUTTON IDR_COMMAND1 - BUTTON IDR_COMMAND6 -} - - - -// -// Bitmap resources -// -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -IDC_NLITE BITMAP "toolbar1.bmp" - - - -// -// Menu resources -// -LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN -IDC_NLITE MENU -{ - POPUP "ƒtƒ@ƒCƒ‹(&F)" - { - MENUITEM "ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚̏I—¹(&X)", IDM_EXIT - } - POPUP "Ý’è(&T)" - { - MENUITEM "ƒNƒbƒL[‚̐ݒè(&B)", IDM_COOKIE - } - POPUP "ƒwƒ‹ƒv(&H)" - { - MENUITEM "ƒo[ƒWƒ‡ƒ“î•ñ(&A)...", IDM_ABOUT - } -} - - - -// -// Dialog resources -// -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -IDD_DIALOG_BROWSERTYPE DIALOG 0, 0, 123, 110 -STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU -CAPTION "ƒNƒbƒL[‚̐ݒè" -FONT 8, "Ms Shell Dlg" -{ - AUTORADIOBUTTON "IE", IDC_RADIO_IE, 30, 29, 22, 8 - AUTORADIOBUTTON "FireFox", IDC_RADIO_FIREFOX, 30, 45, 39, 8 - AUTORADIOBUTTON "GoogleChrome", IDC_RADIO_CHROME, 30, 61, 62, 8 - AUTORADIOBUTTON "IEƒRƒ“ƒ|[ƒlƒ“ƒg", IDC_RADIO_IECM, 30, 76, 61, 8 - PUSHBUTTON "OK", IDC_BUTTON_COOKIE_OK, 21, 91, 38, 14 - PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL, 63, 91, 33, 14 - LTEXT "•’iŽg—p‚µ‚Ä‚¢‚éƒuƒ‰ƒEƒU‚ðŽw’肵‚Ä‚­‚¾‚³‚¢", IDC_STATIC, 21, 6, 82, 22, SS_LEFT -} - - - -// -// String Table resources -// -LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN -STRINGTABLE -{ - IDC_NLITE "nlite" -} - -// -// Accelerator resources -// -LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN -IDC_NLITE ACCELERATORS -{ - "?", IDM_ABOUT, ASCII, ALT - "/", IDM_ABOUT, ASCII, ALT -} - - - -// -// Icon resources -// -LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN -IDI_NLITE ICON "nlite.ico" - - -LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN -IDI_SMALL ICON "small.ico" - - - -// -// Version Information resources -// -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -1 VERSIONINFO - FILEVERSION 0,0,0,1 - PRODUCTVERSION 0,0,0,1 - FILEOS VOS_NT - FILETYPE VFT_APP - FILESUBTYPE VFT2_UNKNOWN - FILEFLAGSMASK 0x00000000 - FILEFLAGS 0x00000000 -{ - BLOCK "StringFileInfo" - { - BLOCK "08000025" - { - VALUE "LegalCopyright", "Copyright (C) 2011 Kohsuke Oikawa." - VALUE "OriginalFilename", "nlite.exe" - VALUE "ProductName", "nlite" - VALUE "ProductVersion", "0.001" - } - } - BLOCK "VarFileInfo" - { - VALUE "Translation", 0x0800, 0x0025 - } -} -======= -// Generated by ResEdit 1.5.8 -// Copyright (C) 2006-2011 -// http://www.resedit.net - #include #include #include @@ -282,4 +137,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL VALUE "Translation", 0x0800, 0x0025 } } ->>>>>>> 430d860a415ba52ccec373d48eb89911e3ad6a51 + diff --git a/nlite/nlite_include.h b/nlite/nlite_include.h index 942e7c2..e68df15 100644 --- a/nlite/nlite_include.h +++ b/nlite/nlite_include.h @@ -5,7 +5,6 @@ #include #include #include -#include #include "resource.h" #include "nlite_define.h" -- 2.11.0