#pragma once
-/* metrics */
-#define PROPSHEETWIDTH 246
-#define PROPSHEETHEIGHT 228
-#define PROPSHEETPADDING(x) (x+x+x+x+x+x)
-#define SYSTEM_COLUMN (18*PROPSHEETPADDING)
-#define LABELLINE(x) (x+x+x+x+x+x+x+x+x+2)
-
-
-#define ICONSIZE 16
-
/* ids */
-#define IDI_CPLACCESS 110
-
-#define IDD_PROPPAGEKEYBOARD 100
-#define IDD_PROPPAGESOUND 101
-#define IDD_PROPPAGEDISPLAY 102
-#define IDD_PROPPAGEMOUSE 103
-#define IDD_PROPPAGEGENERAL 104
+#define IDI_CPLACCESS 110
-#define IDD_STICKYKEYSOPTIONS 105
-#define IDD_FILTERKEYSOPTIONS 106
-#define IDD_BOUNCEKEYSOPTIONS 107
-#define IDD_REPEATKEYSOPTIONS 108
-#define IDD_TOGGLEKEYSOPTIONS 109
+#define IDD_PROPPAGEKEYBOARD 100
+#define IDD_PROPPAGESOUND 101
+#define IDD_PROPPAGEDISPLAY 102
+#define IDD_PROPPAGEMOUSE 103
+#define IDD_PROPPAGEGENERAL 104
-#define IDD_CONTRASTOPTIONS 110
-#define IDD_MOUSEKEYSOPTIONS 111
+#define IDD_STICKYKEYSOPTIONS 105
+#define IDD_FILTERKEYSOPTIONS 106
+#define IDD_BOUNCEKEYSOPTIONS 107
+#define IDD_REPEATKEYSOPTIONS 108
+#define IDD_TOGGLEKEYSOPTIONS 109
-#define IDD_SERIALKEYSOPTIONS 112
+#define IDD_CONTRASTOPTIONS 110
+#define IDD_MOUSEKEYSOPTIONS 111
-#define IDS_CPLSYSTEMNAME 1001
-#define IDS_CPLSYSTEMDESCRIPTION 2001
+#define IDD_SERIALKEYSOPTIONS 112
-#define IDS_SENTRY_NONE 1501
-#define IDS_SENTRY_TITLE 1502
-#define IDS_SENTRY_WINDOW 1503
-#define IDS_SENTRY_DISPLAY 1504
-#define IDS_SECONDS 1505
-#define IDS_MINUTES 1506
+#define IDS_CPLSYSTEMNAME 1001
+#define IDS_CPLSYSTEMDESCRIPTION 2001
+#define IDS_SENTRY_NONE 1501
+#define IDS_SENTRY_TITLE 1502
+#define IDS_SENTRY_WINDOW 1503
+#define IDS_SENTRY_DISPLAY 1504
+#define IDS_SECONDS 1505
+#define IDS_MINUTES 1506
/* controls */
-#define IDC_STICKY_BOX 200
-#define IDC_STICKY_BUTTON 201
-#define IDC_FILTER_BOX 202
-#define IDC_FILTER_BUTTON 203
-#define IDC_TOGGLE_BOX 204
-#define IDC_TOGGLE_BUTTON 205
-#define IDC_KEYBOARD_EXTRA 206
-
-#define IDC_SENTRY_BOX 207
-#define IDC_SENTRY_TEXT 208
-#define IDC_SENTRY_COMBO 209
-#define IDC_SSHOW_BOX 210
-
-#define IDC_CONTRAST_BOX 211
-#define IDC_CONTRAST_BUTTON 212
-#define IDC_MOUSE_BOX 213
-#define IDC_MOUSE_BUTTON 214
-#define IDC_RESET_BOX 215
-#define IDC_RESET_COMBO 216
-#define IDC_NOTIFICATION_MESSAGE 217
-#define IDC_NOTIFICATION_SOUND 218
-#define IDC_SERIAL_BOX 219
-#define IDC_SERIAL_BUTTON 220
-#define IDC_ADMIN_LOGON_BOX 221
-#define IDC_ADMIN_USERS_BOX 222
-
-#define IDC_STICKY_ACTIVATE_CHECK 221
-#define IDC_STICKY_LOCK_CHECK 222
-#define IDC_STICKY_UNLOCK_CHECK 223
-#define IDC_STICKY_SOUND_CHECK 224
-#define IDC_STICKY_STATUS_CHECK 225
-
-#define IDC_FILTER_ACTIVATE_CHECK 230
-#define IDC_FILTER_BOUNCE_RADIO 231
-#define IDC_FILTER_REPEAT_RADIO 232
-#define IDC_FILTER_BOUNCE_BUTTON 233
-#define IDC_FILTER_REPEAT_BUTTON 234
-#define IDC_FILTER_TEST_EDIT 235
-#define IDC_FILTER_SOUND_CHECK 236
-#define IDC_FILTER_STATUS_CHECK 237
-
-#define IDC_BOUNCE_TIME_COMBO 238
-#define IDC_BOUNCE_TEST_EDIT 239
-
-#define IDC_REPEAT_NOREPEAT_RADIO 240
-#define IDC_REPEAT_REPEAT_RADIO 241
-#define IDC_REPEAT_DELAY_COMBO 242
-#define IDC_REPEAT_REPEAT_COMBO 243
-#define IDC_REPEAT_WAIT_COMBO 244
-#define IDC_REPEAT_TEST_EDIT 245
-
-#define IDC_TOGGLE_ACTIVATE_CHECK 250
-
-#define IDC_CONTRAST_ACTIVATE_CHECK 260
-#define IDC_CONTRAST_COMBO 261
-#define IDC_CURSOR_BLINK_TRACK 262
-#define IDC_CURSOR_WIDTH_TRACK 263
-#define IDC_CURSOR_WIDTH_TEXT 264
-
-#define IDC_MOUSEKEYS_ACTIVATE_CHECK 265
-#define IDC_MOUSEKEYS_SPEED_TRACK 266
-#define IDC_MOUSEKEYS_ACCEL_TRACK 267
-#define IDC_MOUSEKEYS_SPEED_CHECK 268
-#define IDC_MOUSEKEYS_ON_RADIO 269
-#define IDC_MOUSEKEYS_OFF_RADIO 270
-#define IDC_MOUSEKEYS_STATUS_CHECK 271
-
-#define IDC_SERIAL_PORT_COMBO 275
-#define IDC_SERIAL_BAUD_COMBO 276
-
-/* EOF */
+#define IDC_STICKY_BOX 200
+#define IDC_STICKY_BUTTON 201
+#define IDC_FILTER_BOX 202
+#define IDC_FILTER_BUTTON 203
+#define IDC_TOGGLE_BOX 204
+#define IDC_TOGGLE_BUTTON 205
+#define IDC_KEYBOARD_EXTRA 206
+
+#define IDC_SENTRY_BOX 207
+#define IDC_SENTRY_TEXT 208
+#define IDC_SENTRY_COMBO 209
+#define IDC_SSHOW_BOX 210
+
+#define IDC_CONTRAST_BOX 211
+#define IDC_CONTRAST_BUTTON 212
+#define IDC_MOUSE_BOX 213
+#define IDC_MOUSE_BUTTON 214
+#define IDC_RESET_BOX 215
+#define IDC_RESET_COMBO 216
+#define IDC_NOTIFICATION_MESSAGE 217
+#define IDC_NOTIFICATION_SOUND 218
+#define IDC_SERIAL_BOX 219
+#define IDC_SERIAL_BUTTON 220
+#define IDC_ADMIN_LOGON_BOX 221
+#define IDC_ADMIN_USERS_BOX 222
+
+#define IDC_STICKY_ACTIVATE_CHECK 221
+#define IDC_STICKY_LOCK_CHECK 222
+#define IDC_STICKY_UNLOCK_CHECK 223
+#define IDC_STICKY_SOUND_CHECK 224
+#define IDC_STICKY_STATUS_CHECK 225
+
+#define IDC_FILTER_ACTIVATE_CHECK 230
+#define IDC_FILTER_BOUNCE_RADIO 231
+#define IDC_FILTER_REPEAT_RADIO 232
+#define IDC_FILTER_BOUNCE_BUTTON 233
+#define IDC_FILTER_REPEAT_BUTTON 234
+#define IDC_FILTER_TEST_EDIT 235
+#define IDC_FILTER_SOUND_CHECK 236
+#define IDC_FILTER_STATUS_CHECK 237
+
+#define IDC_BOUNCE_TIME_COMBO 238
+#define IDC_BOUNCE_TEST_EDIT 239
+
+#define IDC_REPEAT_NOREPEAT_RADIO 240
+#define IDC_REPEAT_REPEAT_RADIO 241
+#define IDC_REPEAT_DELAY_COMBO 242
+#define IDC_REPEAT_REPEAT_COMBO 243
+#define IDC_REPEAT_WAIT_COMBO 244
+#define IDC_REPEAT_TEST_EDIT 245
+
+#define IDC_TOGGLE_ACTIVATE_CHECK 250
+
+#define IDC_CONTRAST_ACTIVATE_CHECK 260
+#define IDC_CONTRAST_COMBO 261
+#define IDC_CURSOR_BLINK_TRACK 262
+#define IDC_CURSOR_WIDTH_TRACK 263
+#define IDC_CURSOR_WIDTH_TEXT 264
+
+#define IDC_MOUSEKEYS_ACTIVATE_CHECK 265
+#define IDC_MOUSEKEYS_SPEED_TRACK 266
+#define IDC_MOUSEKEYS_ACCEL_TRACK 267
+#define IDC_MOUSEKEYS_SPEED_CHECK 268
+#define IDC_MOUSEKEYS_ON_RADIO 269
+#define IDC_MOUSEKEYS_OFF_RADIO 270
+#define IDC_MOUSEKEYS_STATUS_CHECK 271
+
+#define IDC_SERIAL_PORT_COMBO 275
+#define IDC_SERIAL_BAUD_COMBO 276