バージョン番号変更（1.2->1.3）

バージョン情報ダイアログの表示をリソースダイアログ表示に変更。

diff --git a/GVONavish/GVONavish/GVONavish.cpp b/GVONavish/GVONavish/GVONavish.cpp
index a6c185f..ca2e033 100644 (file)
--- a/GVONavish/GVONavish/GVONavish.cpp
+++ b/GVONavish/GVONavish/GVONavish.cpp
@@ -43,6 +43,7 @@ HDC g_hdcMain;
 static ATOM MyRegisterClass( HINSTANCE hInstance );
 static BOOL InitInstance( HINSTANCE, int );
 LRESULT CALLBACK WndProc( HWND, UINT, WPARAM, LPARAM );
+BOOL CALLBACK aboutDlgProc( HWND, UINT, WPARAM, LPARAM );
 static LRESULT s_mainLoop();
 
 
@@ -60,7 +61,6 @@ static void s_onPaint( HWND );
 
 
 // \83A\83v\83\8a\8f\88\97\9d
-static std::wstring s_makeVersionString();
 static std::wstring s_getMapFileName();
 static void s_updateFrame(HWND);
 static void s_updateWindowTitle( HWND, POINT, double );
@@ -72,16 +72,14 @@ static void s_closeShipRoute();
 
 // \83\8d\81[\83J\83\8b\95Ï\90\94
 static LPCWSTR const k_appName = L"GVONavish";         // \83A\83v\83\8a\83P\81[\83V\83\87\83\93\96¼
-static LPCWSTR const k_version = L"ver 1.2";           // \83o\81[\83W\83\87\83\93\94Ô\8d\86
-static LPCWSTR const k_copyright = L"copyright(c) @MandhelingFreak";   // \92\98\8dì\8c \95\\8e¦\81i\82¢\82¿\82¨\81[\81j
+static LPCWSTR const k_version = L"ver 1.3";           // \83o\81[\83W\83\87\83\93\94Ô\8d\86
+static LPCWSTR const k_copyright = L"copyright(c) 2014 @MandhelingFreak";      // \92\98\8dì\8c \95\\8e¦\81i\82¢\82¿\82¨\81[\81j
 
 static LPCWSTR const k_windowClassName = L"GVONavish";         // \83\81\83C\83\93 \83E\83B\83\93\83h\83E \83N\83\89\83X\96¼
 static const LPCWSTR k_configFileName = L"GVONavish.ini";      // \90Ý\92è\83t\83@\83C\83\8b\96¼
 static LPCWSTR const k_appMutexName = L"Global\\{7554E265-3247-4FCA-BC60-5AA814658351}";
 static HANDLE s_appMutex;
 
-static const std::wstring k_aboutText = s_makeVersionString(); // \83o\81[\83W\83\87\83\93\8fî\95ñ\83e\83L\83X\83g
-
 static Gdiplus::GdiplusStartupInput s_gdisi;
 static ULONG_PTR s_gdiToken;
 
@@ -312,10 +310,7 @@ LRESULT CALLBACK WndProc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp )
                // \91I\91ð\82³\82ê\82½\83\81\83j\83\85\81[\82Ì\89ð\90Í:
                switch ( wmId ) {
                case IDM_ABOUT:
-                       ::MessageBox( hwnd,
-                               k_aboutText.c_str(),
-                               k_appName,
-                               MB_OK | MB_ICONINFORMATION );
+                       ::DialogBox( g_hinst, MAKEINTRESOURCE( IDD_ABOUTBOX ), hwnd, aboutDlgProc );
                        break;
                case IDM_EXIT:
                        DestroyWindow( hwnd );
@@ -390,7 +385,6 @@ LRESULT CALLBACK WndProc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp )
                        s_gvoGameProcess.setPollingInterval( s_pollingInterval );
                        break;
 #endif
-
                default:
                        return DefWindowProc( hwnd, message, wp, lp );
                }
@@ -602,15 +596,6 @@ static void s_onPaint( HWND hwnd )
 }
 
 
-static std::wstring s_makeVersionString()
-{
-       std::wstring s;
-       s += std::wstring(k_appName) + L" " + k_version + L"\n";
-       s += k_copyright;
-       return s;
-}
-
-
 // \83}\83b\83v\89æ\91\9c\82ð\91I\91ð\82³\82¹\82é
 static std::wstring s_getMapFileName()
 {
@@ -752,3 +737,32 @@ static void s_closeShipRoute()
 {
        s_shipRouteList->closeRoute();
 }
+
+
+BOOL CALLBACK aboutDlgProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
+{
+       switch ( msg ) {
+       case WM_INITDIALOG:
+       {
+               std::wstring versionString = std::wstring(k_appName) + L" " + k_version;
+               std::wstring copyRightString = std::wstring( k_copyright );
+
+               ::SetDlgItemText( hwnd, IDC_VERSION_LABEL, versionString.c_str() );
+               ::SetDlgItemText( hwnd, IDC_COPYRIGHT_LABEL, copyRightString.c_str() );
+       }
+               break;
+       case WM_COMMAND:
+               switch ( LOWORD( wp ) ) {
+               case IDOK:
+               case IDCANCEL:
+                       ::EndDialog( hwnd, 0 );
+                       break;
+               default:
+                       return FALSE;
+               }
+               break;
+       default:
+               return FALSE;
+       }
+       return TRUE;
+}

diff --git a/GVONavish/GVONavish/GVONavish.rc b/GVONavish/GVONavish/GVONavish.rc
index 690ef72..9ab1b44 100644 (file)
--- a/GVONavish/GVONavish/GVONavish.rc
+++ b/GVONavish/GVONavish/GVONavish.rc
@@ -74,15 +74,16 @@ IDR_SHIPROUTEMANAGEPOPUPMENU MENU
 // Dialog resources
 //
 LANGUAGE LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN
-IDD_ABOUTBOX DIALOGEX 0, 0, 170, 62
+IDD_ABOUTBOX DIALOGEX 0, 0, 194, 69
 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_POPUP | WS_SYSMENU
 CAPTION "\83o\81[\83W\83\87\83\93\8fî\95ñ GVONavish"
-FONT 9, "MS UI Gothic", 0, 0, 1
+FONT 11, "MS UI Gothic", 400, 0, 128
 {
-    ICON            IDR_MAINFRAME, IDC_STATIC, 14, 14, 18, 21, SS_ICON, WS_EX_LEFT
-    LTEXT           "GVONavish, Version 1.0", IDC_STATIC, 42, 14, 114, 8, SS_LEFT | SS_NOPREFIX, WS_EX_LEFT
-    LTEXT           "Copyright (C) 2014", IDC_STATIC, 42, 26, 114, 8, SS_LEFT, WS_EX_LEFT
-    DEFPUSHBUTTON   "OK", IDOK, 113, 41, 50, 14, WS_GROUP, WS_EX_LEFT
+    ICON            IDR_MAINFRAME, IDC_STATIC, 14, 14, 16, 17, SS_ICON, WS_EX_LEFT
+    CONTROL         "GVONavish, Version 1.0", IDC_VERSION_LABEL, WC_STATIC, SS_LEFTNOWORDWRAP | SS_NOPREFIX, 42, 14, 149, 8, WS_EX_LEFT
+    CONTROL         "Copyright (C) 2014", IDC_COPYRIGHT_LABEL, WC_STATIC, SS_LEFTNOWORDWRAP, 42, 26, 149, 8, WS_EX_LEFT
+    DEFPUSHBUTTON   "OK", IDOK, 141, 52, 50, 14, WS_GROUP, WS_EX_LEFT
+    LTEXT           "http://gvonavish.sourceforge.jp/", 0, 42, 39, 149, 8, SS_LEFT, WS_EX_LEFT
 }
 
 

diff --git a/GVONavish/GVONavish/Resource.h b/GVONavish/GVONavish/Resource.h
index c82dd70..faec028 100644 (file)
--- a/GVONavish/GVONavish/Resource.h
+++ b/GVONavish/GVONavish/Resource.h
@@ -11,6 +11,8 @@
 #define IDR_POPUPMENU                           137
 #define IDC_SHIPROUTELIST                       138
 #define IDI_BLANK                               145
+#define IDC_COPYRIGHT_LABEL                     146
+#define IDC_VERSION_LABEL                       147
 #define IDM_DELETE_SHIP_ROUTE                   40000
 #define IDM_ROUTE_MANAGE_OPTION                 40001
 #define IDM_DEBUG_INTERVAL_NORMAL               40002