OSDN Git Service

(root) / nlite / nlite.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: beccd9a)
2011/12/28 3:25:09
authorqwerty2501 <riot313@gmail.com>
Tue, 27 Dec 2011 18:25:09 +0000 (03:25 +0900)
committerqwerty2501 <riot313@gmail.com>
Tue, 27 Dec 2011 18:25:09 +0000 (03:25 +0900)
nlite.suo patch | blob | history
nlite/bk/nlite.rc [new file with mode: 0644] patch | blob
nlite/nlite.rc patch | blob | history
nlite/nlite_include.h patch | blob | history

diff --git a/nlite.suo b/nlite.suo
index 97c4b75..5e88b78 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ
diff --git a/nlite/bk/nlite.rc b/nlite/bk/nlite.rc
new file mode 100644 (file)
index 0000000..ed0a356
--- /dev/null
+++ b/nlite/bk/nlite.rc
@@ -0,0 +1,282 @@
+
+
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#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 "\83t\83@\83C\83\8b(&F)"
+    {
+        MENUITEM "\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82Ì\8fI\97¹(&X)", IDM_EXIT
+    }
+    POPUP "\90Ý\92è(&T)"
+    {
+        MENUITEM "\83N\83b\83L\81[\82Ì\90Ý\92è(&B)", IDM_COOKIE
+    }
+    POPUP "\83w\83\8b\83v(&H)"
+    {
+        MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&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 "\83N\83b\83L\81[\82Ì\90Ý\92è"
+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\83R\83\93\83|\81[\83l\83\93\83g", IDC_RADIO_IECM, 30, 76, 61, 8
+    PUSHBUTTON      "OK", IDC_BUTTON_COOKIE_OK, 21, 91, 38, 14
+    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 63, 91, 33, 14
+    LTEXT           "\95\81\92i\8eg\97p\82µ\82Ä\82¢\82é\83u\83\89\83E\83U\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢", 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 <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#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 "\83t\83@\83C\83\8b(&F)"
+    {
+        MENUITEM "\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82Ì\8fI\97¹(&X)", IDM_EXIT
+    }
+    POPUP "\90Ý\92è(&T)"
+    {
+        MENUITEM "\83N\83b\83L\81[\82Ì\90Ý\92è(&B)", IDM_COOKIE
+    }
+    POPUP "\83w\83\8b\83v(&H)"
+    {
+        MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&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 "\83N\83b\83L\81[\82Ì\90Ý\92è"
+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\83R\83\93\83|\81[\83l\83\93\83g", IDC_RADIO_IECM, 30, 76, 61, 8
+    PUSHBUTTON      "OK", IDC_BUTTON_COOKIE_OK, 21, 91, 38, 14
+    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 63, 91, 33, 14
+    LTEXT           "\95\81\92i\8eg\97p\82µ\82Ä\82¢\82é\83u\83\89\83E\83U\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢", 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 (file)
--- 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 <windows.h>
-#include <commctrl.h>
-#include <richedit.h>
-#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 "\83t\83@\83C\83\8b(&F)"
-    {
-        MENUITEM "\83A\83v\83\8a\83P\81[\83V\83\87\83\93\82Ì\8fI\97¹(&X)", IDM_EXIT
-    }
-    POPUP "\90Ý\92è(&T)"
-    {
-        MENUITEM "\83N\83b\83L\81[\82Ì\90Ý\92è(&B)", IDM_COOKIE
-    }
-    POPUP "\83w\83\8b\83v(&H)"
-    {
-        MENUITEM "\83o\81[\83W\83\87\83\93\8fî\95ñ(&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 "\83N\83b\83L\81[\82Ì\90Ý\92è"
-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\83R\83\93\83|\81[\83l\83\93\83g", IDC_RADIO_IECM, 30, 76, 61, 8
-    PUSHBUTTON      "OK", IDC_BUTTON_COOKIE_OK, 21, 91, 38, 14
-    PUSHBUTTON      "\83L\83\83\83\93\83Z\83\8b", IDCANCEL, 63, 91, 33, 14
-    LTEXT           "\95\81\92i\8eg\97p\82µ\82Ä\82¢\82é\83u\83\89\83E\83U\82ð\8ew\92è\82µ\82Ä\82­\82¾\82³\82¢", 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 <windows.h>
 #include <commctrl.h>
 #include <richedit.h>
@@ -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 (file)
--- a/nlite/nlite_include.h
+++ b/nlite/nlite_include.h
@@ -5,7 +5,6 @@
 #include <qwerty\windebuger.h>
 #include <nlib.h>
 #include <nlib_define.h>
-#include <vcmpool.h>
 #include "resource.h"
 
 #include "nlite_define.h"
ニコニコ生放送軽量コメントビューア
About OSDN
Find Software
Develop Software
Help