Fix icon and online help.

diff --git a/ChangeLog b/ChangeLog
index fecf734..7bf987e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-02-23  Saito <saito2@digitalme.com>
 
        * interface/w32g_res.[h,rc], interface/w32g_i.c,
-         interface/w32g_subwin.c, interface/w32g_pref.c:
+         interface/w32g_subwin.c, interface/w32g_pref.c, interface/w32g_icon.ico:
          Change and add some items.
 
 2004-02-22  Saito <saito2@digitalme.com>

diff --git a/interface/w32g_i.c b/interface/w32g_i.c
index a460817..b856ef9 100644 (file)
--- a/interface/w32g_i.c
+++ b/interface/w32g_i.c
@@ -1029,6 +1029,23 @@ void MainCmdProc(HWND hwnd, int wId, HWND hwndCtl, UINT wNotifyCode)
       case IDM_MHHELP:
                  MessageBox(hwnd, "Not Supported.","Warning!",MB_OK);
                  break;
+      case IDM_MHONLINEHELP:
+                 if (PlayerLanguage == LANGUAGE_JAPANESE) {
+                         ShellExecute(HWND_DESKTOP, NULL, "http://timidity-docs.sourceforge.jp/", NULL, NULL, SW_SHOWNORMAL);
+                 } else {
+                         ShellExecute(HWND_DESKTOP, NULL, "http://timidity.sourceforge.net/index.html.en", NULL, NULL, SW_SHOWNORMAL);
+                 }
+                 break;
+      case IDM_MHBTS:
+                 if (PlayerLanguage == LANGUAGE_JAPANESE) {
+                         ShellExecute(HWND_DESKTOP, NULL, "http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-ja/guest.cgi", NULL, NULL, SW_SHOWNORMAL);
+                 } else {
+                         ShellExecute(HWND_DESKTOP, NULL, "http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi", NULL, NULL, SW_SHOWNORMAL);
+                 }
+                 break;
+      case IDM_MHONLINEHELPCFG:
+                 ShellExecute(HWND_DESKTOP, NULL, "http://timidity-docs.sourceforge.jp/cgi-bin/hiki/hiki.cgi?%28ja%29timidity.cfg", NULL, NULL, SW_SHOWNORMAL);
+                 break;
       case IDM_MHVERSION:
                  VersionWnd(hwnd);
                  break;

diff --git a/interface/w32g_icon.ico b/interface/w32g_icon.ico
index 878bafc..bce8441 100644 (file)
Binary files a/interface/w32g_icon.ico and b/interface/w32g_icon.ico differ

diff --git a/interface/w32g_res.h b/interface/w32g_res.h
index bafdc43..7f2c670 100644 (file)
--- a/interface/w32g_res.h
+++ b/interface/w32g_res.h
@@ -330,6 +330,9 @@
 #define IDC_COMBO_LPF                   2107
 #define IDM_MHSUPPLEMENT                40002
 #define IDM_FORCE_RELOAD                40003
+#define IDM_MHONLINEHELP                40004
+#define IDM_MHONLINEHELPCFG             40005
+#define IDM_MHBTS                       40006
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -337,7 +340,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        157
-#define _APS_NEXT_COMMAND_VALUE         40004
+#define _APS_NEXT_COMMAND_VALUE         40007
 #define _APS_NEXT_CONTROL_VALUE         2105
 #define _APS_NEXT_SYMED_VALUE           101
 #endif

diff --git a/interface/w32g_res.rc b/interface/w32g_res.rc
index 75bfbee..665a555 100644 (file)
--- a/interface/w32g_res.rc
+++ b/interface/w32g_res.rc
@@ -694,6 +694,9 @@ BEGIN
     END\r
     POPUP "Help(&H)"\r
     BEGIN\r
+        MENUITEM "Online Help(&O)",             IDM_MHONLINEHELP\r
+        MENUITEM "Bug Tracking System(&B)",     IDM_MHBTS\r
+        MENUITEM SEPARATOR\r
         MENUITEM "Topic(&T)",                   IDM_MHTOPIC, GRAYED\r
         MENUITEM "Help(&H)",                    IDM_MHHELP, GRAYED\r
         MENUITEM SEPARATOR\r
@@ -1417,6 +1420,10 @@ BEGIN
     END\r
     POPUP "\83w\83\8b\83v(&H)"\r
     BEGIN\r
+        MENUITEM "\83I\83\93\83\89\83C\83\93\83w\83\8b\83v(&O)",        IDM_MHONLINEHELP\r
+        MENUITEM "\83R\83\93\83t\83B\83O\83t\83@\83C\83\8b\8fÚ\89ð(&C)",  IDM_MHONLINEHELPCFG\r
+        MENUITEM "\83o\83O\95ñ\8d\90\8f\8a(&B)",              IDM_MHBTS\r
+        MENUITEM SEPARATOR\r
         MENUITEM "\83g\83s\83b\83N(&T)",                IDM_MHTOPIC, GRAYED\r
         MENUITEM "\83w\83\8b\83v(&H)",                  IDM_MHHELP, GRAYED\r
         MENUITEM SEPARATOR\r
@@ -1575,8 +1582,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,12,0,0\r
- PRODUCTVERSION 2,12,0,0\r
+ FILEVERSION 2,13,0,0\r
+ PRODUCTVERSION 2,13,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -1591,13 +1598,18 @@ BEGIN
     BEGIN\r
         BLOCK "000004e4"\r
         BEGIN\r
+            VALUE "Comments", "\0"\r
+            VALUE "CompanyName", "\0"\r
             VALUE "FileDescription", "timw32g\0"\r
-            VALUE "FileVersion", "2, 12, 0, 0\0"\r
+            VALUE "FileVersion", "2, 13, 0, 0\0"\r
             VALUE "InternalName", "timw32g\0"\r
             VALUE "LegalCopyright", "Copyright (C) 1999-2002 Masanao Izumo <mo@goice.co.jp>\r\nCopyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>\0"\r
+            VALUE "LegalTrademarks", "\0"\r
             VALUE "OriginalFilename", "timw32g.exe\0"\r
+            VALUE "PrivateBuild", "\0"\r
             VALUE "ProductName", "TiMidity++ Win32GUI Version\0"\r
-            VALUE "ProductVersion", "2, 12, 0, 0\0"\r
+            VALUE "ProductVersion", "2, 13, 0, 0\0"\r
+            VALUE "SpecialBuild", "\0"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r