Skip to content

Commit 543885b

Browse files
chenzhaochenzhao
committed
specify properties window layout for Windows 10
1 parent 6c5924f commit 543885b

File tree

4 files changed

+75
-30
lines changed

4 files changed

+75
-30
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ ipch
77
*.opensdf
88
*.aps
99

10+
11+
*.db

‎xkeymacs/xkeymacs-vc10.vcxproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,37 @@
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{8EEC4832-1538-8942-A213-6F85EE1CD8D4}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
24+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2425
</PropertyGroup>
2526
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2627
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2728
<ConfigurationType>Application</ConfigurationType>
2829
<UseDebugLibraries>true</UseDebugLibraries>
2930
<UseOfMfc>Dynamic</UseOfMfc>
3031
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>Windows7.1SDK</PlatformToolset>
32+
<PlatformToolset>v140</PlatformToolset>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3435
<ConfigurationType>Application</ConfigurationType>
3536
<UseDebugLibraries>true</UseDebugLibraries>
3637
<UseOfMfc>Dynamic</UseOfMfc>
3738
<CharacterSet>MultiByte</CharacterSet>
38-
<PlatformToolset>Windows7.1SDK</PlatformToolset>
39+
<PlatformToolset>v140</PlatformToolset>
3940
</PropertyGroup>
4041
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4142
<ConfigurationType>Application</ConfigurationType>
4243
<UseDebugLibraries>false</UseDebugLibraries>
4344
<UseOfMfc>Dynamic</UseOfMfc>
4445
<CharacterSet>MultiByte</CharacterSet>
45-
<PlatformToolset>Windows7.1SDK</PlatformToolset>
46+
<PlatformToolset>v140</PlatformToolset>
4647
<WholeProgramOptimization>true</WholeProgramOptimization>
4748
</PropertyGroup>
4849
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4950
<ConfigurationType>Application</ConfigurationType>
5051
<UseDebugLibraries>false</UseDebugLibraries>
5152
<UseOfMfc>Dynamic</UseOfMfc>
5253
<CharacterSet>MultiByte</CharacterSet>
53-
<PlatformToolset>Windows7.1SDK</PlatformToolset>
54+
<PlatformToolset>v140</PlatformToolset>
5455
<WholeProgramOptimization>true</WholeProgramOptimization>
5556
</PropertyGroup>
5657
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -72,6 +73,7 @@
7273
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7374
<LinkIncremental>true</LinkIncremental>
7475
<TargetName>xkeymacs</TargetName>
76+
<LibraryPath>C:\Users\chenzhao\Downloads\xkeymacs-master\xkeymacs-master\xkeymacs\Debug;$(LibraryPath)</LibraryPath>
7577
</PropertyGroup>
7678
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7779
<LinkIncremental>true</LinkIncremental>

‎xkeymacs/xkeymacs.rc

+61-22
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#undef APSTUDIO_READONLY_SYMBOLS
1414

1515
/////////////////////////////////////////////////////////////////////////////
16-
// ���{�� (���{) resources
16+
// ����(�ձ�) resources
1717

1818
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
1919
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
@@ -1497,12 +1497,12 @@ BEGIN
14971497
IDS_REG_ENTRY_MX "mx_icon"
14981498
END
14991499

1500-
#endif // ���{�� (���{) resources
1500+
#endif // ����(�ձ�) resources
15011501
/////////////////////////////////////////////////////////////////////////////
15021502

15031503

15041504
/////////////////////////////////////////////////////////////////////////////
1505-
// �p�� (�č�) resources
1505+
// Ӣ��(����) resources
15061506

15071507
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
15081508
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -2015,26 +2015,26 @@ BEGIN
20152015
CONTROL "Wk",IDC_ACPI_WAKE_,"Button",BS_OWNERDRAW,358,142,17,16
20162016
END
20172017

2018-
IDD_PROPERTIES DIALOGEX 0, 0, 422, 279
2018+
IDD_PROPERTIES DIALOGEX 0, 0, 491, 348
20192019
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
20202020
CAPTION "Properties"
20212021
FONT 8, "Tahoma", 0, 0, 0x1
20222022
BEGIN
2023-
COMBOBOX IDC_APPLICATION,7,7,320,246,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
2024-
CONTROL "Use Default Setting",IDC_SETTING_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,338,7,77,10
2025-
CONTROL "Use Specific Setting",IDC_SETTING_SPECIFIC,"Button",BS_AUTORADIOBUTTON,338,16,80,10
2026-
CONTROL "Disable XKeymacs",IDC_SETTING_DISABLE,"Button",BS_AUTORADIOBUTTON,338,25,75,10
2027-
CONTROL "",IDC_TAB,"Static",SS_BLACKFRAME | WS_GROUP,7,39,411,213
2023+
COMBOBOX IDC_APPLICATION,55,7,320,246,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
2024+
CONTROL "Use Default Setting",IDC_SETTING_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,406,7,77,10
2025+
CONTROL "Use Specific Setting",IDC_SETTING_SPECIFIC,"Button",BS_AUTORADIOBUTTON,406,16,80,10
2026+
CONTROL "Disable XKeymacs",IDC_SETTING_DISABLE,"Button",BS_AUTORADIOBUTTON,406,26,75,10
2027+
CONTROL "",IDC_TAB,"Static",SS_BLACKFRAME | WS_GROUP,7,39,480,213
20282028
CONTROL "Use Dialog setting for all dialogs",IDC_USE_DIALOG_SETTING,
20292029
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,115,10
2030-
PUSHBUTTON "Load Default",IDC_LOAD_DEFAULT,3,260,50,14
2031-
PUSHBUTTON "Select All",IDC_SELECT_ALL,59,260,50,14
2032-
PUSHBUTTON "Clear All",IDC_CLEAR_ALL,116,260,50,14
2033-
DEFPUSHBUTTON "OK",IDOK,254,260,50,14
2034-
PUSHBUTTON "Cancel",IDCANCEL,311,260,50,14
2035-
PUSHBUTTON "&Apply",IDC_APPLY,368,260,50,14
2036-
LTEXT "kill-ring-max: ",IDC_STATIC,262,26,41,8
2037-
EDITTEXT IDC_KILL_RING_MAX,306,24,20,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
2030+
PUSHBUTTON "Load Default",IDC_LOAD_DEFAULT,3,329,50,14
2031+
PUSHBUTTON "Select All",IDC_SELECT_ALL,59,329,50,14
2032+
PUSHBUTTON "Clear All",IDC_CLEAR_ALL,116,329,50,14
2033+
DEFPUSHBUTTON "OK",IDOK,323,329,50,14
2034+
PUSHBUTTON "Cancel",IDCANCEL,380,329,50,14
2035+
PUSHBUTTON "&Apply",IDC_APPLY,437,329,50,14
2036+
LTEXT "kill-ring-max: ",IDC_STATIC,310,26,41,8
2037+
EDITTEXT IDC_KILL_RING_MAX,354,24,20,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
20382038
EDITTEXT IDC_WINDOW_TEXT,150,25,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE
20392039
LTEXT "Use if the window title is ",IDC_STATIC,67,32,78,8,NOT WS_VISIBLE
20402040
END
@@ -2123,10 +2123,10 @@ BEGIN
21232123
CONTROL "M-c",IDC_MC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,298,173,29,10
21242124
END
21252125

2126-
IDD_PROPERTIES_ADVANCED DIALOG 0, 0, 408, 202
2126+
IDD_PROPERTIES_ADVANCED DIALOGEX 0, 0, 408, 202
21272127
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
21282128
CAPTION "Advanced"
2129-
FONT 8, "Tahoma"
2129+
FONT 8, "Tahoma", 0, 0, 0x0
21302130
BEGIN
21312131
LTEXT "&Category:",IDC_STATIC,7,7,31,8
21322132
COMBOBOX IDC_CATEGORY,7,17,106,132,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
@@ -2197,9 +2197,9 @@ BEGIN
21972197
IDD_PROPERTIES, DIALOG
21982198
BEGIN
21992199
LEFTMARGIN, 7
2200-
RIGHTMARGIN, 418
2200+
RIGHTMARGIN, 487
22012201
TOPMARGIN, 7
2202-
BOTTOMMARGIN, 274
2202+
BOTTOMMARGIN, 343
22032203
END
22042204

22052205
IDD_PROPERTIES_BASIC, DIALOG
@@ -2332,22 +2332,38 @@ END
23322332
// Icon with lowest ID value placed first to ensure application icon
23332333
// remains consistent on all systems.
23342334
IDR_MAINFRAME ICON "res\\xkeymacs.ico"
2335+
23352336
IDR_MAIN_DISABLE_WOCQ ICON "res\\disableWOCQ.ico"
2337+
23362338
IDI_CTRL_ON ICON "res\\ctrl_on.ico"
2339+
23372340
IDI_CTRL_OFF ICON "res\\ctrl_off.ico"
2341+
23382342
IDI_CX_ON ICON "res\\cx_on.ico"
2343+
23392344
IDI_CX_OFF ICON "res\\cx_off.ico"
2345+
23402346
IDI_SHIFT_ON ICON "res\\shift_on.ico"
2347+
23412348
IDI_SHIFT_OFF ICON "res\\shift_of.ico"
2349+
23422350
IDI_ALT_ON ICON "res\\alt_on.ico"
2351+
23432352
IDI_ALT_OFF ICON "res\\alt_off.ico"
2353+
23442354
IDI_META_ON ICON "res\\meta_on.ico"
2355+
23452356
IDI_META_OFF ICON "res\\meta_off.ico"
2357+
23462358
IDR_MAIN_DISABLE ICON "res\\disable.ico"
2359+
23472360
IDR_MAIN_DISABLE_TMP ICON "res\\disableTMP.ico"
2361+
23482362
IDI_MX_ON ICON "res\\mx_on.ico"
2363+
23492364
IDI_MX_OFF ICON "res\\mx_off.ico"
23502365

2366+
23512367
/////////////////////////////////////////////////////////////////////////////
23522368
//
23532369
// Accelerator
@@ -2414,19 +2430,42 @@ END
24142430
//
24152431

24162432
IDC_HAND_CURSOR CURSOR "res\\hand.cur"
2433+
24172434
IDC_DRAG_CURSOR CURSOR "res\\drag.cur"
2435+
24182436
IDC_DISABLE_CURSOR CURSOR "res\\disable_.cur"
2437+
24192438
IDC_DISABLE_WOCQ_CURSOR CURSOR "res\\disable_wocq.cur"
2439+
24202440
IDC_DISABLE_TMP_CURSOR CURSOR "res\\disable_tmp.cur"
24212441

2442+
24222443
/////////////////////////////////////////////////////////////////////////////
24232444
//
24242445
// Bitmap
24252446
//
24262447

24272448
IDB_SORT_ASCENDING BITMAP "res\\sort_asc.bmp"
2449+
24282450
IDB_SORT_DESCENDING BITMAP "res\\sort_des.bmp"
24292451

2452+
2453+
/////////////////////////////////////////////////////////////////////////////
2454+
//
2455+
// AFX_DIALOG_LAYOUT
2456+
//
2457+
2458+
IDD_PROPERTIES AFX_DIALOG_LAYOUT
2459+
BEGIN
2460+
0
2461+
END
2462+
2463+
IDD_PROPERTIES_ADVANCED AFX_DIALOG_LAYOUT
2464+
BEGIN
2465+
0
2466+
END
2467+
2468+
24302469
/////////////////////////////////////////////////////////////////////////////
24312470
//
24322471
// String Table
@@ -3169,7 +3208,7 @@ BEGIN
31693208
IDS_REG_ENTRY_MX "mx_icon"
31703209
END
31713210

3172-
#endif // �p�� (�č�) resources
3211+
#endif // Ӣ��(����) resources
31733212
/////////////////////////////////////////////////////////////////////////////
31743213

31753214

‎xkeymacsdll/xkeymacsdll-vc10.vcxproj

+6-4
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,37 @@
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{1C6AA554-5283-2136-B3EF-277915DBCDF5}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
24+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2425
</PropertyGroup>
2526
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2627
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2728
<ConfigurationType>DynamicLibrary</ConfigurationType>
2829
<UseDebugLibraries>true</UseDebugLibraries>
2930
<UseOfMfc>Dynamic</UseOfMfc>
3031
<CharacterSet>MultiByte</CharacterSet>
31-
<PlatformToolset>Windows7.1SDK</PlatformToolset>
32+
<PlatformToolset>v140</PlatformToolset>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3435
<ConfigurationType>DynamicLibrary</ConfigurationType>
3536
<UseDebugLibraries>true</UseDebugLibraries>
3637
<UseOfMfc>Dynamic</UseOfMfc>
3738
<CharacterSet>MultiByte</CharacterSet>
38-
<PlatformToolset>Windows7.1SDK</PlatformToolset>
39+
<PlatformToolset>v140</PlatformToolset>
3940
</PropertyGroup>
4041
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4142
<ConfigurationType>DynamicLibrary</ConfigurationType>
4243
<UseDebugLibraries>false</UseDebugLibraries>
4344
<UseOfMfc>Dynamic</UseOfMfc>
4445
<CharacterSet>MultiByte</CharacterSet>
45-
<PlatformToolset>Windows7.1SDK</PlatformToolset>
46+
<PlatformToolset>v140</PlatformToolset>
4647
<WholeProgramOptimization>true</WholeProgramOptimization>
4748
</PropertyGroup>
4849
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4950
<ConfigurationType>DynamicLibrary</ConfigurationType>
5051
<UseDebugLibraries>false</UseDebugLibraries>
5152
<UseOfMfc>Dynamic</UseOfMfc>
5253
<CharacterSet>MultiByte</CharacterSet>
53-
<PlatformToolset>Windows7.1SDK</PlatformToolset>
54+
<PlatformToolset>v140</PlatformToolset>
5455
<WholeProgramOptimization>true</WholeProgramOptimization>
5556
</PropertyGroup>
5657
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -72,6 +73,7 @@
7273
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7374
<LinkIncremental>true</LinkIncremental>
7475
<TargetName>xkeymacs</TargetName>
76+
<OutDir>..\xkeymacs\Debug</OutDir>
7577
</PropertyGroup>
7678
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7779
<LinkIncremental>true</LinkIncremental>

0 commit comments

Comments
 (0)