Skip to content

fix build: sync dialog control IDs across viv.c, resource.h and .rc #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skywolf wants to merge 1 commit into
base: master
Choose a base branch
from
+62 −30
Open

fix build: sync dialog control IDs across viv.c, resource.h and .rc #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion res/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,35 @@
#define IDC_TITLE_BAR_FORMAT 1052
#define IDC_SHRINK_BLIT_MODE_STATIC 1053
#define IDC_MAGNIFY_BLIT_MODE_STATIC 1054
#define IDC_ASSOCIATIONS_GROUPBOX 1055
#define IDC_LEFT_CLICK_ACTION_STATIC 1056
#define IDC_RIGHT_CLICK_ACTION_STATIC 1057
#define IDC_MOUSE_WHEEL_ACTION_STATIC 1058
#define IDC_COMMANDS_STATIC 1059
#define IDC_SETTINGS_FOR_SELECTED_COMMAND_STATIC 1060
#define IDC_EDIT_KEYBOARD_SHORTCUT_KEY_STATIC 1061
#define IDC_EDIT_KEYBOARD_SHORTCUT_KEY_CURRENTLY_USED_BY_STATIC 1062
#define IDC_TITLE_BAR_FORMAT_STATIC 1063
#define IDC_WINDOWEDBACKGROUNDCOLOR_STATIC 1064
#define IDC_FULLSCREENBACKGROUNDCOLOR_STATIC 1065
#define IDC_CUSTOM_RATE_STATIC 1066
#define IDC_SEARCH_EVERYTHING_RANDOM_CHECKBOX 1021
#define IDC_SHRINK_BLIT_MODE_COMBOBOX 1016
#define IDC_MAGNIFY_BLIT_MODE_COMBOBOX 1022
#define IDC_TITLE_BAR_FORMAT_COMBOBOX 1052
#define IDC_AUTO_SIZE_WINDOW_COMBOBOX 1051
#define IDC_LOOP_ANIMATIONS_ONCE_STATIC 1028
#define IDC_PRELOAD_NEXT_IMAGE_STATIC 1048
#define IDC_CACHE_LAST_IMAGE_STATIC 1049
#define IDC_WINDOWEDBACKGROUNDCOLOR_BUTTON 1039
#define IDC_FULLSCREENBACKGROUNDCOLOR_BUTTON 1040
#define IDC_LEFTCLICKACTION_COMBOBOX 1029
#define IDC_RIGHTCLICKACTION_COMBOBOX 1030
#define IDC_MOUSEWHEELACTION_COMBOBOX 1034
#define IDC_ADD_KEY_BUTTON 1023
#define IDC_EDIT_KEY_BUTTON 1024
#define IDC_REMOVE_KEY_BUTTON 1033
#define IDC_CUSTOM_RATE_TYPE_COMBOBOX 1027

// Next default values for new objects
//
Expand All @@ -98,7 +127,7 @@
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 130
#define _APS_NEXT_COMMAND_VALUE 40048
#define _APS_NEXT_CONTROL_VALUE 1055
#define _APS_NEXT_CONTROL_VALUE 1067
#define _APS_NEXT_SYMED_VALUE 109
#endif
#endif
58 changes: 29 additions & 29 deletions res/voidImageViewer.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ BEGIN
CONTROL "Allow multiple &instances",IDC_MULTIPLE_INSTANCES,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,18,186,10
CONTROL "Start &menu shortcuts",IDC_STARTMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,36,186,10
GROUPBOX "Associations",IDC_STATIC,0,54,54,124
GROUPBOX "Associations",IDC_ASSOCIATIONS_GROUPBOX,0,54,54,124
CONTROL "&BMP",IDC_BMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,42,10
CONTROL "&GIF",IDC_GIF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,78,42,10
CONTROL "IC&O",IDC_ICO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,90,42,10
Expand Down Expand Up @@ -71,41 +71,41 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Shrink blit mode:",IDC_SHRINK_BLIT_MODE_STATIC,0,0,74,12,SS_CENTERIMAGE
COMBOBOX IDC_COMBO1,74,0,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_SHRINK_BLIT_MODE_COMBOBOX,74,0,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Magnify blit mode:",IDC_MAGNIFY_BLIT_MODE_STATIC,0,19,74,8
COMBOBOX IDC_COMBO2,74,17,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Title bar format:",IDC_STATIC,0,36,74,8
COMBOBOX IDC_TITLE_BAR_FORMAT,74,34,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_MAGNIFY_BLIT_MODE_COMBOBOX,74,17,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Title bar format:",IDC_TITLE_BAR_FORMAT_STATIC,0,36,74,8
COMBOBOX IDC_TITLE_BAR_FORMAT_COMBOBOX,74,34,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Auto si&ze window:",IDC_AUTO_ZOOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,53,74,10
COMBOBOX IDC_COMBO4,74,51,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "&Play animations at least once in slideshow",IDC_LOOP_ANIMATIONS_ONCE,
COMBOBOX IDC_AUTO_SIZE_WINDOW_COMBOBOX,74,51,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "&Play animations at least once in slideshow",IDC_LOOP_ANIMATIONS_ONCE_STATIC,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,70,192,10
CONTROL "Preload &next image",IDC_PRELOAD_NEXT_IMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,87,192,10
CONTROL "Cache &last image",IDC_CACHE_LAST_IMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,103,192,10
LTEXT "&Windowed background color:",IDC_STATIC,0,122,96,8
PUSHBUTTON "",IDC_WINDOWEDBACKGROUNDCOLOR,96,120,50,14,BS_BITMAP
LTEXT "&Fullscreen background color:",IDC_STATIC,0,140,96,8
PUSHBUTTON "",IDC_FULLSCREENBACKGROUNDCOLOR,96,138,50,14,BS_BITMAP
CONTROL "Preload &next image",IDC_PRELOAD_NEXT_IMAGE_STATIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,87,192,10
CONTROL "Cache &last image",IDC_CACHE_LAST_IMAGE_STATIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,103,192,10
LTEXT "&Windowed background color:",IDC_WINDOWEDBACKGROUNDCOLOR_STATIC,0,122,96,8
PUSHBUTTON "",IDC_WINDOWEDBACKGROUNDCOLOR_BUTTON,96,120,50,14,BS_BITMAP
LTEXT "&Fullscreen background color:",IDC_FULLSCREENBACKGROUNDCOLOR_STATIC,0,140,96,8
PUSHBUTTON "",IDC_FULLSCREENBACKGROUNDCOLOR_BUTTON,96,138,50,14,BS_BITMAP
END

IDD_CONTROLS DIALOGEX 0, 0, 194, 216
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "&Left click action:",IDC_STATIC,0,0,54,12,SS_CENTERIMAGE
COMBOBOX IDC_LEFTCLICKACTION,74,0,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Right click action:",IDC_STATIC,0,19,63,8
COMBOBOX IDC_RIGHTCLICKACTION,74,17,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Mouse wheel action:",IDC_STATIC,0,36,72,8
COMBOBOX IDC_MOUSEWHEELACTION,74,34,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Commands:",IDC_STATIC,0,53,57,8
LTEXT "&Left click action:",IDC_LEFT_CLICK_ACTION_STATIC,0,0,54,12,SS_CENTERIMAGE
COMBOBOX IDC_LEFTCLICKACTION_COMBOBOX,74,0,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Right click action:",IDC_RIGHT_CLICK_ACTION_STATIC,0,19,63,8
COMBOBOX IDC_RIGHTCLICKACTION_COMBOBOX,74,17,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Mouse wheel action:",IDC_MOUSE_WHEEL_ACTION_STATIC,0,36,72,8
COMBOBOX IDC_MOUSEWHEELACTION_COMBOBOX,74,34,119,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Commands:",IDC_COMMANDS_STATIC,0,53,57,8
LISTBOX IDC_COMMANDS_LIST,0,64,193,78,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Settings for selected command",IDC_STATIC,0,148,193,67
GROUPBOX "Settings for selected command",IDC_SETTINGS_FOR_SELECTED_COMMAND_STATIC,0,148,193,67
LISTBOX IDC_KEYS_LIST,7,158,125,50,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "&Add...",IDC_ADD_KEY,138,158,50,14
PUSHBUTTON "&Edit...",IDC_EDIT_KEY,137,177,50,14
PUSHBUTTON "Remo&ve",IDC_REMOVE_KEY,137,195,50,14
PUSHBUTTON "&Add...",IDC_ADD_KEY_BUTTON,138,158,50,14
PUSHBUTTON "&Edit...",IDC_EDIT_KEY_BUTTON,137,177,50,14
PUSHBUTTON "Remo&ve",IDC_REMOVE_KEY_BUTTON,137,195,50,14
END

IDD_CUSTOM_RATE DIALOGEX 0, 0, 202, 63
Expand All @@ -116,8 +116,8 @@ BEGIN
EDITTEXT IDC_CUSTOM_RATE_EDIT,54,12,66,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
DEFPUSHBUTTON "OK",IDOK,90,36,48,14
PUSHBUTTON "Cancel",IDCANCEL,144,36,48,14
LTEXT "&Custom rate:",IDC_STATIC,6,14,45,8
COMBOBOX IDC_CUSTOM_RATE_TYPE_COMBO,126,12,66,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "&Custom rate:",IDC_CUSTOM_RATE_STATIC,6,14,45,8
COMBOBOX IDC_CUSTOM_RATE_TYPE_COMBOBOX,126,12,66,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END

IDD_ABOUT DIALOGEX 0, 0, 228, 189
Expand All @@ -141,9 +141,9 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Edit Keyboard Shortcut"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Shortcut &key:",IDC_STATIC,7,7,44,8
LTEXT "Shortcut &key:",IDC_EDIT_KEYBOARD_SHORTCUT_KEY_STATIC,7,7,44,8
EDITTEXT IDC_EDIT_KEY_EDIT,7,17,172,14,ES_AUTOHSCROLL | ES_WANTRETURN
LTEXT "Shortcut key currently used by:",IDC_STATIC,7,36,102,8
LTEXT "Shortcut key currently used by:",IDC_EDIT_KEYBOARD_SHORTCUT_KEY_CURRENTLY_USED_BY_STATIC,7,36,102,8
LISTBOX IDC_EDIT_KEY_CURRENTLY_USED_BY_LIST,7,47,172,43,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,70,98,50,14
PUSHBUTTON "Cancel",IDCANCEL,129,98,50,14
Expand Down Expand Up @@ -178,7 +178,7 @@ CAPTION "Search Everything"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
EDITTEXT IDC_EVERYTHING_EDIT,6,6,173,14,ES_AUTOHSCROLL
CONTROL "Randomize",IDC_SEARCH_EVERYTHING_RANDOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,24,51,10
CONTROL "Randomize",IDC_SEARCH_EVERYTHING_RANDOM_CHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,24,51,10
DEFPUSHBUTTON "OK",IDOK,72,42,50,14
PUSHBUTTON "Cancel",IDCANCEL,127,42,50,14
END
Expand Down
3 changes: 3 additions & 0 deletions vs2026/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/.vs
x64/
*.user