From e8fddb17cfe19f11d8f339536ba35073e2626f6c Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Tue, 4 Jan 2022 20:39:18 -0500 Subject: [PATCH] Standardize more things --- src/include/86box/resource.h | 2 +- src/win/languages/cs-CZ.rc | 16 +-- src/win/languages/de-DE.rc | 16 +-- src/win/languages/dialogs.rc | 229 ++++++++++++++++++++++------------- src/win/languages/fi-FI.rc | 6 + src/win/languages/hu-HU.rc | 2 + src/win/languages/it-IT.rc | 3 +- src/win/win_settings.c | 12 +- 8 files changed, 176 insertions(+), 110 deletions(-) diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index b5a67b85b..fe298aa9f 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -128,7 +128,7 @@ #define IDC_COMBO_MACHINE 1011 /* machine/cpu config */ #define IDC_CONFIGURE_MACHINE 1012 #define IDC_COMBO_CPU_TYPE 1013 -#define IDC_COMBO_CPU 1014 +#define IDC_COMBO_CPU_SPEED 1014 #define IDC_COMBO_FPU 1015 #define IDC_COMBO_WS 1016 #ifdef USE_DYNAREC diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index a68446043..bfb2b44f8 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -328,14 +328,14 @@ END #define STR_PCAP "PCap zařízení:" #define STR_NET "Síťový adaptér:" -#define STR_COM1 "Zařízení na COM1" -#define STR_COM2 "Zařízení na COM2" -#define STR_COM3 "Zařízení na COM3" -#define STR_COM4 "Zařízení na COM4" -#define STR_LPT1 "Zařízení na LPT1" -#define STR_LPT2 "Zařízení na LPT2" -#define STR_LPT3 "Zařízení na LPT3" -#define STR_LPT4 "Zařízení na LPT4" +#define STR_COM1 "Zařízení na COM1:" +#define STR_COM2 "Zařízení na COM2:" +#define STR_COM3 "Zařízení na COM3:" +#define STR_COM4 "Zařízení na COM4:" +#define STR_LPT1 "Zařízení na LPT1:" +#define STR_LPT2 "Zařízení na LPT2:" +#define STR_LPT3 "Zařízení na LPT3:" +#define STR_LPT4 "Zařízení na LPT4:" #define STR_SERIAL1 "Povolit port COM1" #define STR_SERIAL2 "Povolit port COM2" #define STR_SERIAL3 "Povolit port COM3" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index b45d0e013..0c49bc015 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -328,14 +328,14 @@ END #define STR_PCAP "PCap-Gerät:" #define STR_NET "Netzwerkadapter:" -#define STR_COM1 "COM1-Gerät" -#define STR_COM2 "COM2-Gerät" -#define STR_COM3 "COM3-Gerät" -#define STR_COM4 "COM4-Gerät" -#define STR_LPT1 "LPT1-Gerät" -#define STR_LPT2 "LPT2-Gerät" -#define STR_LPT3 "LPT3-Gerät" -#define STR_LPT4 "LPT4-Gerät" +#define STR_COM1 "COM1-Gerät:" +#define STR_COM2 "COM2-Gerät:" +#define STR_COM3 "COM3-Gerät:" +#define STR_COM4 "COM4-Gerät:" +#define STR_LPT1 "LPT1-Gerät:" +#define STR_LPT2 "LPT2-Gerät:" +#define STR_LPT3 "LPT3-Gerät:" +#define STR_LPT4 "LPT4-Gerät:" #define STR_SERIAL1 "Serielle Schnittstelle 1" #define STR_SERIAL2 "Serielle Schnittstelle 2" #define STR_SERIAL3 "Serielle Schnittstelle 3" diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index e4420a516..3e8a5eed1 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -1,3 +1,13 @@ +#define DLG_CFG_BTN_WIDTH 46 +#define DLG_CFG_BTN_HEIGHT 12 +#define DLG_CFG_COMBO_NOBTN_WIDTH 265 +#define DLG_CFG_COMBO_BTN_WIDTH 235 +#define DLG_CFG_COMBO_BTN_LEFT 315 +#define CFG_PANE_TOP 0 +#define CFG_PANE_LEFT 118 +#define CFG_PANE_WIDTH 365 +#define CFG_PANE_HEIGHT 0 + DLG_PREFERENCES DIALOG DISCARDABLE 0, 0, 240, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION STR_PREFERENCES @@ -47,18 +57,6 @@ BEGIN WS_BORDER,53,45,166,14 END -DLG_CONFIG DIALOG DISCARDABLE 0, 0, 456, 256 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION STR_CONFIG -FONT FONT_SIZE, FONT_NAME -BEGIN - DEFPUSHBUTTON STR_OK,IDOK,246,235,50,14 - PUSHBUTTON STR_CANCEL,IDCANCEL,307,235,50,14 - CONTROL "List2",IDC_SETTINGSCATLIST,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | - LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,101,212 - CONTROL "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,454,1 -END - DLG_SPECIFY_DIM DIALOG DISCARDABLE 0, 0, 175, 66 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION STR_SPECIFY_DIM @@ -80,35 +78,59 @@ BEGIN PUSHBUTTON STR_CANCEL,IDCANCEL,99,45,50,14 END -DLG_CFG_MACHINE DIALOG DISCARDABLE 108, 0, 345, 200 +DLG_CONFIG DIALOG DISCARDABLE 0, 0, 486, 256 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION STR_CONFIG +FONT FONT_SIZE, FONT_NAME +BEGIN + DEFPUSHBUTTON STR_OK,IDOK,246,235,50,14 + PUSHBUTTON STR_CANCEL,IDCANCEL,307,235,50,14 + CONTROL "List2",IDC_SETTINGSCATLIST,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,111,212 + CONTROL "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,464,1 +END + +DLG_CFG_MACHINE DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 200 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - COMBOBOX IDC_COMBO_MACHINE_TYPE,71,7,189,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_MACHINE_TYPE,71,7,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MACHINE_TYPE,IDT_1708,7,9,60,10 - COMBOBOX IDC_COMBO_MACHINE,71,26,168,120,CBS_DROPDOWNLIST | + + COMBOBOX IDC_COMBO_MACHINE,71,26,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MACHINE,IDT_1701,7,28,60,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MACHINE,244,26,46,12 - COMBOBOX IDC_COMBO_CPU_TYPE,71,45,110,120,CBS_DROPDOWNLIST | + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MACHINE,DLG_CFG_COMBO_BTN_LEFT,25,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT + + COMBOBOX IDC_COMBO_CPU_TYPE,71,45,115,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CPU_TYPE,IDT_1702,7,47,59,10 - COMBOBOX IDC_COMBO_CPU,215,45,45,120,CBS_DROPDOWNLIST | + + COMBOBOX IDC_COMBO_CPU_SPEED,220,45,30,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SPEED,IDT_1704,189,47,24,10 - COMBOBOX IDC_COMBO_FPU,71,64,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | + LTEXT STR_SPEED,IDT_1704,194,47,24,10 + + COMBOBOX IDC_COMBO_FPU,71,64,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_FPU,IDT_1707,7,66,59,10 - COMBOBOX IDC_COMBO_WS,71,83,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | + + COMBOBOX IDC_COMBO_WS,71,83,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_WAIT_STATES,IDT_1703,7,85,60,10 - EDITTEXT IDC_MEMTEXT,70,102,45,12,ES_AUTOHSCROLL | ES_NUMBER + + EDITTEXT IDC_MEMTEXT,71,102,45,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_MEMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,113,101, 12,12 - LTEXT STR_MB,IDT_1705,123,104,10,10 + LTEXT STR_MB,IDT_1705,123,104,12,10 LTEXT STR_MEMORY,IDT_1706,7,104,30,10 + +#ifdef USE_DYNAREC + CONTROL STR_DYNAREC,IDC_CHECK_DYNAREC,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,120,120,10 +#endif + GROUPBOX STR_TIME_SYNC,IDC_TIME_SYNC,7,135,100,56 CONTROL STR_DISABLED,IDC_RADIO_TS_DISABLED,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,147,84,10 @@ -116,115 +138,135 @@ BEGIN BS_AUTORADIOBUTTON | WS_TABSTOP,14,161,84,10 CONTROL STR_ENABLED_UTC, IDC_RADIO_TS_UTC,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,14,175,84,10 -#ifdef USE_DYNAREC - CONTROL STR_DYNAREC,IDC_CHECK_DYNAREC,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,120,120,10 -#endif END -DLG_CFG_VIDEO DIALOG DISCARDABLE 108, 0, 345, 45 +DLG_CFG_VIDEO DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 45 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_VIDEO,IDT_1707,7,9,48,10 - COMBOBOX IDC_COMBO_VIDEO,64,7,235,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_VIDEO,71,7,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_VID,302,7,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_VID,DLG_CFG_COMBO_BTN_LEFT,7,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_VOODOO,IDC_CHECK_VOODOO,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,27,199,10 - PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_VOODOO,302,26,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_VOODOO,DLG_CFG_COMBO_BTN_LEFT,25,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT END -DLG_CFG_INPUT DIALOG DISCARDABLE 108, 0, 345, 65 +DLG_CFG_INPUT DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 65 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_MOUSE,IDT_1709,7,9,57,10 - COMBOBOX IDC_COMBO_MOUSE,71,7,140,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_MOUSE,71,7,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MOUSE,214,7,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MOUSE,DLG_CFG_COMBO_BTN_LEFT,7,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT LTEXT STR_JOYSTICK,IDT_1710,7,27,58,10 - COMBOBOX IDC_COMBO_JOYSTICK,71,25,189,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_JOYSTICK,71,25,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_JOY1,IDC_JOY1,7,44,50,14 - PUSHBUTTON STR_JOY2,IDC_JOY2,74,44,50,14 - PUSHBUTTON STR_JOY3,IDC_JOY3,141,44,50,14 - PUSHBUTTON STR_JOY4,IDC_JOY4,209,44,50,14 + PUSHBUTTON STR_JOY1,IDC_JOY1,7,44,60,14 + PUSHBUTTON STR_JOY2,IDC_JOY2,84,44,60,14 + PUSHBUTTON STR_JOY3,IDC_JOY3,151,44,60,14 + PUSHBUTTON STR_JOY4,IDC_JOY4,219,44,60,14 END -DLG_CFG_SOUND DIALOG DISCARDABLE 108, 0, 345, 201 +DLG_CFG_SOUND DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 201 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - COMBOBOX IDC_COMBO_SOUND,71,7,170,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_SOUND,71,7,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_SOUND,IDT_1711,7,9,59,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,244,7,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,DLG_CFG_COMBO_BTN_LEFT,6,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT - COMBOBOX IDC_COMBO_MIDI,71,26,170,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_MIDI,71,26,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MIDI,IDT_1712,7,28,59,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI,244,26,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI,DLG_CFG_COMBO_BTN_LEFT,25,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT - COMBOBOX IDC_COMBO_MIDI_IN,71,45,170,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_MIDI_IN,71,45,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MIDI_IN,IDT_1713,7,47,59,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_IN,244,45,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_IN,DLG_CFG_COMBO_BTN_LEFT,44,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_MPU401,IDC_CHECK_MPU401,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,66,199,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MPU401,244,64,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MPU401,DLG_CFG_COMBO_BTN_LEFT,64,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_SSI,IDC_CHECK_SSI,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,84,95,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SSI,244,82,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SSI,DLG_CFG_COMBO_BTN_LEFT,82,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_CMS,IDC_CHECK_CMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,102,95,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_CMS,244,100,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_CMS,DLG_CFG_COMBO_BTN_LEFT,100,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_GUS,IDC_CHECK_GUS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,120,94,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_GUS,244,118,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_GUS,DLG_CFG_COMBO_BTN_LEFT,118,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_FLOAT,IDC_CHECK_FLOAT,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,94,10 END -DLG_CFG_NETWORK DIALOG DISCARDABLE 108, 0, 345, 65 +DLG_CFG_NETWORK DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 65 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_NET_TYPE,IDT_1714,7,9,59,10 - COMBOBOX IDC_COMBO_NET_TYPE,71,7,229,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_NET_TYPE,71,7,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_PCAP,IDT_1715,7,28,59,10 - COMBOBOX IDC_COMBO_PCAP,71,26,229,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_PCAP,71,26,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_NET,IDT_1716,7,47,59,10 - COMBOBOX IDC_COMBO_NET,71,45,170,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_NET,71,45,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_NET,244,44,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_NET,DLG_CFG_COMBO_BTN_LEFT,44,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT END -DLG_CFG_PORTS DIALOG DISCARDABLE 108, 0, 345, 135 +DLG_CFG_PORTS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 135 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN +/* + LTEXT STR_COM1,IDT_1717,7,9,61,10 + COMBOBOX IDC_COMBO_COM1,71,7,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + + LTEXT STR_COM2,IDT_1718,7,28,61,10 + COMBOBOX IDC_COMBO_COM2,71,26,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + + LTEXT STR_COM3,IDT_1719,7,47,61,10 + COMBOBOX IDC_COMBO_COM3,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + + LTEXT STR_COM4,IDT_1720,7,66,61,10 + COMBOBOX IDC_COMBO_COM4,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP +*/ + LTEXT STR_LPT1,IDT_1717,7,9,61,10 - COMBOBOX IDC_COMBO_LPT1,71,7,229,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_LPT1,71,7,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_LPT2,IDT_1718,7,28,61,10 - COMBOBOX IDC_COMBO_LPT2,71,26,229,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_LPT2,71,26,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_LPT3,IDT_1719,7,47,61,10 - COMBOBOX IDC_COMBO_LPT3,71,45,229,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_LPT3,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +/* + LTEXT STR_LPT4,IDT_1720,7,66,61,10 + COMBOBOX IDC_COMBO_LPT4,71,45,229,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP +*/ + CONTROL STR_SERIAL1,IDC_CHECK_SERIAL1,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,64,94,10 CONTROL STR_SERIAL2,IDC_CHECK_SERIAL2,"Button", @@ -240,59 +282,63 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,147,100,94,10 CONTROL STR_PARALLEL3,IDC_CHECK_PARALLEL3,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,118,94,10 +/* + CONTROL STR_PARALLEL4,IDC_CHECK_PARALLEL4,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,147,118,94,10 +*/ END -DLG_CFG_STORAGE DIALOG DISCARDABLE 108, 0, 345, 203 +DLG_CFG_STORAGE DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 203 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_HDC,IDT_1718,7,9,64,10 - COMBOBOX IDC_COMBO_HDC,64,7,185,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_HDC,71,7,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_HDC,252,7,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_HDC,DLG_CFG_COMBO_BTN_LEFT,6,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT LTEXT STR_FDC,IDT_1768,7,28,64,10 - COMBOBOX IDC_COMBO_FDC,64,26,185,120,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_FDC,71,26,DLG_CFG_COMBO_BTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_FDC,252,26,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_FDC,DLG_CFG_COMBO_BTN_LEFT,25,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_IDE_TER,IDC_CHECK_IDE_TER,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,239,10 - PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_TER,252,45,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_TER,DLG_CFG_COMBO_BTN_LEFT,45,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_IDE_QUA,IDC_CHECK_IDE_QUA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,66,239,10 - PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_QUA,252,64,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_QUA,DLG_CFG_COMBO_BTN_LEFT,64,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT - GROUPBOX STR_SCSI,IDC_GROUP_SCSI,7,85,253,93 + GROUPBOX STR_SCSI,IDC_GROUP_SCSI,7,85,340,93 LTEXT STR_SCSI_1,IDT_1763,16,102,48,10 COMBOBOX IDC_COMBO_SCSI_1,73,100,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_1,213,100,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_1,213,99,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT LTEXT STR_SCSI_2,IDT_1764,16,121,48,10 COMBOBOX IDC_COMBO_SCSI_2,73,119,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_2,213,119,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_2,213,118,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT LTEXT STR_SCSI_3,IDT_1765,16,140,48,10 COMBOBOX IDC_COMBO_SCSI_3,73,138,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_3,213,138,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_3,213,137,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT LTEXT STR_SCSI_4,IDT_1766,16,159,48,10 COMBOBOX IDC_COMBO_SCSI_4,73,157,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_4,213,157,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_4,213,156,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_CASSETTE,IDC_CHECK_CASSETTE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,185,94,10 END -DLG_CFG_HARD_DISKS DIALOG DISCARDABLE 108, 0, 345, 154 +DLG_CFG_HARD_DISKS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 154 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN CONTROL "List1",IDC_LIST_HARD_DISKS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,18,283,92 + WS_TABSTOP,7,18,340,92 LTEXT STR_HDD,IDT_1720,7,7,253,8 PUSHBUTTON STR_NEW,IDC_BUTTON_HDD_ADD_NEW,60,137,62,10 PUSHBUTTON STR_EXISTING,IDC_BUTTON_HDD_ADD,129,137,62,10 @@ -353,13 +399,13 @@ BEGIN WS_BORDER,7,16,204,12 END -DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE 108, 0, 345, 222 +DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 222 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN CONTROL "List1",IDC_LIST_FLOPPY_DRIVES,"SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,18,283,60 + WS_TABSTOP,7,18,340,60 LTEXT STR_FLOPPY_DRIVES,IDT_1737,7,7,253,8 COMBOBOX IDC_COMBO_FD_TYPE,33,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -371,7 +417,7 @@ BEGIN CONTROL "List1",IDC_LIST_CDROM_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,117,283,60 + WS_TABSTOP,7,117,340,60 LTEXT STR_CDROM_DRIVES,IDT_1739,7,107,253,8 COMBOBOX IDC_COMBO_CD_BUS,33,185,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -387,14 +433,14 @@ BEGIN LTEXT STR_SPEED,IDT_1758,7,207,24,8 END -DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE 108, 0, 345, 222 +DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 222 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN CONTROL "List1",IDC_LIST_MO_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,17,283,60 + WS_TABSTOP,7,17,340,60 LTEXT STR_MO_DRIVES,IDT_1769,7,7,253,8 COMBOBOX IDC_COMBO_MO_BUS,33,85,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -411,7 +457,7 @@ BEGIN CONTROL "List1",IDC_LIST_ZIP_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | - WS_TABSTOP,7,137,283,60 + WS_TABSTOP,7,137,340,60 LTEXT STR_ZIP_DRIVES,IDT_1759,7,127,253,8 COMBOBOX IDC_COMBO_ZIP_BUS,33,205,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -426,32 +472,32 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,218,205,44,10 END -DLG_CFG_PERIPHERALS DIALOG DISCARDABLE 108, 0, 345, 154 +DLG_CFG_PERIPHERALS DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, 154 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN LTEXT STR_ISARTC,IDT_1767,7,9,48,10 - COMBOBOX IDC_COMBO_ISARTC,64,7,155,120, + COMBOBOX IDC_COMBO_ISARTC,71,7,DLG_CFG_COMBO_BTN_WIDTH,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISARTC,222,7,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISARTC,DLG_CFG_COMBO_BTN_LEFT,6,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT GROUPBOX STR_ISAMEM,IDC_GROUP_ISAMEM,7,28,253,93 LTEXT STR_ISAMEM_1,IDT_1763,16,45,48,10 COMBOBOX IDC_COMBO_ISAMEM_1,73,43,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_1,213,43,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_1,213,42,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT LTEXT STR_ISAMEM_2,IDT_1764,16,64,48,10 COMBOBOX IDC_COMBO_ISAMEM_2,73,62,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_2,213,62,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_2,213,61,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT LTEXT STR_ISAMEM_3,IDT_1765,16,83,48,10 COMBOBOX IDC_COMBO_ISAMEM_3,73,81,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_3,213,81,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_3,213,80,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT LTEXT STR_ISAMEM_4,IDT_1766,16,102,48,10 COMBOBOX IDC_COMBO_ISAMEM_4,73,100,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_4,213,100,38,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_4,213,99,DLG_CFG_BTN_WIDTH,DLG_CFG_BTN_HEIGHT CONTROL STR_BUGGER,IDC_CHECK_BUGGER,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,128,94,10 @@ -460,6 +506,17 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,147,128,94,10 END +#undef DLG_CFG_BTN_WIDTH +#undef DLG_CFG_BTN_HEIGHT +#undef DLG_CFG_COMBO_NOBTN_WIDTH +#undef DLG_CFG_COMBO_BTN_WIDTH +#undef DLG_CFG_COMBO_BTN_LEFT +#undef CFG_PANE_TOP +#undef CFG_PANE_LEFT +#undef CFG_PANE_WIDTH +#undef CFG_PANE_HEIGHT + + #undef STR_PREFERENCES #undef STR_SND_GAIN #undef STR_NEW_FLOPPY diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index 56430464d..102d8f08b 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -328,9 +328,14 @@ END #define STR_PCAP "PCap-laite:" #define STR_NET "Verkkokortti:" +#define STR_COM1 "COM1-laite:" +#define STR_COM2 "COM2-laite:" +#define STR_COM3 "COM3-laite:" +#define STR_COM4 "COM4-laite:" #define STR_LPT1 "LPT1-laite:" #define STR_LPT2 "LPT2-laite:" #define STR_LPT3 "LPT3-laite:" +#define STR_LPT4 "LPT4-laite:" #define STR_SERIAL1 "Sarjaportti 1" #define STR_SERIAL2 "Sarjaportti 2" #define STR_SERIAL3 "Sarjaportti 3" @@ -338,6 +343,7 @@ END #define STR_PARALLEL1 "Rinnakkaisportti 1" #define STR_PARALLEL2 "Rinnakkaisportti 2" #define STR_PARALLEL3 "Rinnakkaisportti 3" +#define STR_PARALLEL4 "Rinnakkaisportti 4" #define STR_HDC "Kiintolevyohjain:" #define STR_FDC "Levykeohjain:" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 8ad87ec22..9cdce6921 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -11,6 +11,8 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT #pragma code_page(65001) #endif //_WIN32 +#define AUTHORS + ///////////////////////////////////////////////////////////////////////////// // // Menu diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index ec6e7132d..0ec6c31d4 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -6,7 +6,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN #pragma code_page(65001) #endif //_WIN32 -#define explorerdotexe +// explorerdotexe +#define AUTHORS ///////////////////////////////////////////////////////////////////////////// // diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 3511277ef..e37a2cfa0 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -707,13 +707,13 @@ win_settings_machine_recalc_cpu_m(HWND hdlg) lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR)); - settings_reset_content(hdlg, IDC_COMBO_CPU); + settings_reset_content(hdlg, IDC_COMBO_CPU_SPEED); c = i = 0; while (temp_cpu_f->cpus[c].cpu_type != 0) { if (cpu_is_eligible(temp_cpu_f, c, temp_machine)) { stransi = (char *) temp_cpu_f->cpus[c].name; mbstowcs(lptsTemp, stransi, strlen(stransi) + 1); - settings_add_string(hdlg, IDC_COMBO_CPU, (LPARAM)(LPCSTR)lptsTemp); + settings_add_string(hdlg, IDC_COMBO_CPU_SPEED, (LPARAM)(LPCSTR)lptsTemp); if (first_eligible == -1) first_eligible = i; @@ -727,13 +727,13 @@ win_settings_machine_recalc_cpu_m(HWND hdlg) } if (i == 0) fatal("No eligible CPUs for the selected family\n"); - settings_enable_window(hdlg, IDC_COMBO_CPU, i != 1); + settings_enable_window(hdlg, IDC_COMBO_CPU_SPEED, i != 1); if (current_eligible < first_eligible) current_eligible = first_eligible; else if (current_eligible > last_eligible) current_eligible = last_eligible; temp_cpu = listtocpu[current_eligible]; - settings_set_cur_sel(hdlg, IDC_COMBO_CPU, current_eligible); + settings_set_cur_sel(hdlg, IDC_COMBO_CPU_SPEED, current_eligible); win_settings_machine_recalc_cpu(hdlg); @@ -974,9 +974,9 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) win_settings_machine_recalc_cpu_m(hdlg); } break; - case IDC_COMBO_CPU: + case IDC_COMBO_CPU_SPEED: if (HIWORD(wParam) == CBN_SELCHANGE) { - temp_cpu = listtocpu[settings_get_cur_sel(hdlg, IDC_COMBO_CPU)]; + temp_cpu = listtocpu[settings_get_cur_sel(hdlg, IDC_COMBO_CPU_SPEED)]; win_settings_machine_recalc_cpu(hdlg); } break;