80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Rename Program Settings to Preferences

Browse Source
This commit is contained in:
David Hrdlička
2021-11-20 23:24:11 +01:00
parent 70ffdef11d
commit a1df1c23ed
20 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/resource.h
View File

@@ -29,7 +29,7 @@
#define DLG_SND_GAIN 103 /* top-level dialog */
#define DLG_NEW_FLOPPY 104 /* top-level dialog */
#define DLG_SPECIFY_DIM 105 /* top-level dialog */
#define DLG_PROG_SETT 106 /* top-level dialog */
#define DLG_PREFERENCES 106 /* top-level dialog */
#define DLG_CONFIG 110 /* top-level dialog */
#define DLG_CFG_MACHINE 111 /* sub-dialog of config */
#define DLG_CFG_VIDEO 112 /* sub-dialog of config */
@@ -357,7 +357,7 @@
#define IDM_DISCORD 40090
#endif
#define IDM_VID_PROG_SETT 40091
#define IDM_PREFERENCES 40091
#if defined(DEV_BRANCH) && defined(USE_OPENGL)
#define IDM_VID_GL_FPS_BLITTER 40100

4
src/include/86box/win.h
View File

@@ -188,8 +188,8 @@ extern void NewFloppyDialogCreate(HWND hwnd, int id, int part);
/* Functions in win_specify_dim.c: */
extern void SpecifyDimensionsDialogCreate(HWND hwnd);
/* Functions in win_lang.c: */
extern void ProgSettDlgCreate(HWND hwnd);
/* Functions in win_preferences.c: */
extern void PreferencesDlgCreate(HWND hwnd);
/* Functions in win_settings.c: */

2
src/win/CMakeLists.txt
View File

@@ -20,7 +20,7 @@ add_library(plat OBJECT win.c win_dynld.c win_cdrom.c win_thread.c
add_library(ui OBJECT win_ui.c win_icon.c win_stbar.c win_sdl.c win_dialog.c win_about.c
win_settings.c win_devconf.c win_snd_gain.c win_specify_dim.c win_new_floppy.c
win_jsconf.c win_media_menu.c win_progsett.c 86Box.rc)
win_jsconf.c win_media_menu.c win_preferences.c 86Box.rc)
if(MSVC)
# MSVC complains when we include the manifest from 86Box.rc...

2
src/win/Makefile.mingw
View File

@@ -408,7 +408,7 @@ else
UIOBJ := win_ui.o win_icon.o win_stbar.o \
win_sdl.o \
win_dialog.o win_about.o \
win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o win_progsett.o \
win_settings.o win_devconf.o win_snd_gain.o win_specify_dim.o win_preferences.o \
win_new_floppy.o win_jsconf.o win_media_menu.o
endif

4
src/win/languages/cs-CZ.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Nastavení...", IDM_CONFIG
MENUITEM "&Aktualizovat ikony stavového řádku", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Change program &settings...", IDM_VID_PROG_SETT
MENUITEM "Change program &settings...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Povolit integraci s &Discordem", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Program Settings"
#define STR_PREFERENCES "Program Settings"
#define STR_SND_GAIN "Zesílení zvuku"
#define STR_NEW_FLOPPY "Nový obraz"
#define STR_CONFIG "Nastavení emulátoru 86Box"

4
src/win/languages/de-DE.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Einstellungen...", IDM_CONFIG
MENUITEM "&Statusleistenicons aktualisieren", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Programmeinstellungen ändern...", IDM_VID_PROG_SETT
MENUITEM "Programmeinstellungen ändern...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "&Discord-Integration aktivieren", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Programmeinstellungen"
#define STR_PREFERENCES "Programmeinstellungen"
#define STR_SND_GAIN "Klangverstärkung"
#define STR_NEW_FLOPPY "Neues Image"
#define STR_CONFIG "86Box-Einstellungen"

6
src/win/languages/dialogs.rc
View File

@@ -1,6 +1,6 @@
DLG_PROG_SETT DIALOG DISCARDABLE 0, 0, 240, 118
DLG_PREFERENCES DIALOG DISCARDABLE 0, 0, 240, 118
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION STR_PROG_SETT
CAPTION STR_PREFERENCES
FONT FONT_SIZE, FONT_NAME
BEGIN
DEFPUSHBUTTON STR_OK, IDOK, 123, 97, 50, 14
@@ -460,7 +460,7 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,147,128,94,10
END
#undef STR_PROG_SETT
#undef STR_PREFERENCES
#undef STR_SND_GAIN
#undef STR_NEW_FLOPPY
#undef STR_CONFIG

6
src/win/languages/en-US.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Settings...", IDM_CONFIG
MENUITEM "&Update status bar icons", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Change program &settings...", IDM_VID_PROG_SETT
MENUITEM "&Preferences...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Enable &Discord integration", IDM_DISCORD
@@ -273,10 +273,10 @@ END
// Dialog
//
#define STR_PROG_SETT "Program Settings"
#define STR_PREFERENCES "86Box Preferences"
#define STR_SND_GAIN "Sound Gain"
#define STR_NEW_FLOPPY "New Image"
#define STR_CONFIG "86Box Settings"
#define STR_CONFIG "Machine Settings"
#define STR_SPECIFY_DIM "Specify Main Window Dimensions"
#define STR_OK "OK"

4
src/win/languages/fi-FI.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Tietokoneen asetukset...", IDM_CONFIG
MENUITEM "&Päivitä tilapalkin kuvakkeita", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "&Ohjelman asetukset...", IDM_VID_PROG_SETT
MENUITEM "&Ohjelman asetukset...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Käytä &Discord integraatiota", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Ohjelman asetukset"
#define STR_PREFERENCES "Ohjelman asetukset"
#define STR_SND_GAIN "Äänen tulotaso"
#define STR_NEW_FLOPPY "Uusi levykuva"
#define STR_CONFIG "Tietokoneen asetukset"

4
src/win/languages/fr-FR.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Réglages...", IDM_CONFIG
MENUITEM "Mettre à jour la barre de stat&us", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Changer la &langue...", IDM_VID_PROG_SETT
MENUITEM "Changer la &langue...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Activer intégration &Discord", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Changer langue"
#define STR_PREFERENCES "Changer langue"
#define STR_SND_GAIN "Gain son"
#define STR_NEW_FLOPPY "Nouvelle image"
#define STR_CONFIG "Réglages 86Box"

4
src/win/languages/hr-HR.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Postavke...", IDM_CONFIG
MENUITEM "&Ažuriranje ikone statusne trake", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "&Promjeni postavke programa...", IDM_VID_PROG_SETT
MENUITEM "&Promjeni postavke programa...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Omogući integraciju &Discord-a", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Postavke programa"
#define STR_PREFERENCES "Postavke programa"
#define STR_SND_GAIN "Pojačavanje zvuka"
#define STR_NEW_FLOPPY "Nova slika"
#define STR_CONFIG "86Box postavke"

4
src/win/languages/hu-HU.rc
View File

@@ -104,7 +104,7 @@ BEGIN
MENUITEM "&Beállítások...", IDM_CONFIG
MENUITEM "Állapotsori ikonok &frissítése", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Program&beállítások...", IDM_VID_PROG_SETT
MENUITEM "Program&beállítások...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "&Discord integráció engedélyezése", IDM_DISCORD
@@ -276,7 +276,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Programbeállítások"
#define STR_PREFERENCES "Programbeállítások"
#define STR_SND_GAIN "Hangerőszabályzó"
#define STR_NEW_FLOPPY "Új képfájl létrehozása"
#define STR_CONFIG "86Box beállítások"

4
src/win/languages/it-IT.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Impostazioni...", IDM_CONFIG
MENUITEM "&Aggiorna icone della barra di stato", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Change program &settings...", IDM_VID_PROG_SETT
MENUITEM "Change program &settings...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Abilita &integrazione Discord", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Program Settings"
#define STR_PREFERENCES "Program Settings"
#define STR_SND_GAIN "Guadagno del suono"
#define STR_NEW_FLOPPY "Nuova immagine"
#define STR_CONFIG "Impostazioni di 86Box"

4
src/win/languages/ja-JP.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "設定(&S)...", IDM_CONFIG
MENUITEM "ステータスバーアイコンの更新(&U)", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "表示言語の変更(&P)...", IDM_VID_PROG_SETT
MENUITEM "表示言語の変更(&P)...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Discordとの連携を可能にする(&D)", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "表示言語の変更"
#define STR_PREFERENCES "表示言語の変更"
#define STR_SND_GAIN "サウンドゲイン"
#define STR_NEW_FLOPPY "新規のイメージ"
#define STR_CONFIG "86Boxの設定"

4
src/win/languages/pt-BR.rc
View File

@@ -102,7 +102,7 @@ BEGIN
MENUITEM "&Configurações...", IDM_CONFIG
MENUITEM "&Atualizar ícones da barra de status", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Alterar &configurações do programa...", IDM_VID_PROG_SETT
MENUITEM "Alterar &configurações do programa...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Ativar integração com o &Discord", IDM_DISCORD
@@ -274,7 +274,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Configurações do programa"
#define STR_PREFERENCES "Configurações do programa"
#define STR_SND_GAIN "Ganho de som"
#define STR_NEW_FLOPPY "Nova imagem de disquete"
#define STR_CONFIG "Configurações do 86Box"

4
src/win/languages/pt-PT.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Definições...", IDM_CONFIG
MENUITEM "&Atualizar ícones da barra de estado", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Change program &settings...", IDM_VID_PROG_SETT
MENUITEM "Change program &settings...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Ativar integração com &Discord", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Program Settings"
#define STR_PREFERENCES "Program Settings"
#define STR_SND_GAIN "Ganho de som"
#define STR_NEW_FLOPPY "Nova imagem"
#define STR_CONFIG "Definições do 86Box"

4
src/win/languages/sl-SI.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "&Nastavitve...", IDM_CONFIG
MENUITEM "&Posodabljaj ikone statusne vrstice", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "&Spremeni jezik...", IDM_VID_PROG_SETT
MENUITEM "&Spremeni jezik...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "Omogoči integracijo s programom &Discord", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Spremeni jezik"
#define STR_PREFERENCES "Spremeni jezik"
#define STR_SND_GAIN "Ojačanje zvoka"
#define STR_NEW_FLOPPY "Nova slika"
#define STR_CONFIG "Nastavitve programa 86Box"

4
src/win/languages/zh-CN.rc
View File

@@ -101,7 +101,7 @@ BEGIN
MENUITEM "设置(&S)...", IDM_CONFIG
MENUITEM "更新状态栏图标(&U)", IDM_UPDATE_ICONS
MENUITEM SEPARATOR
MENUITEM "Change program &settings...", IDM_VID_PROG_SETT
MENUITEM "Change program &settings...", IDM_PREFERENCES
# ifdef USE_DISCORD
MENUITEM SEPARATOR
MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD
@@ -273,7 +273,7 @@ END
// Dialog
//
#define STR_PROG_SETT "Program Settings"
#define STR_PREFERENCES "Program Settings"
#define STR_SND_GAIN "音量增益"
#define STR_NEW_FLOPPY "新建镜像"
#define STR_CONFIG "86Box 设置"

30
src/win/win_progsett.c → src/win/win_preferences.c
View File

@@ -39,7 +39,7 @@ static char temp_icon_set[256] = {0};
int enum_helper, c;
HWND hwndProgSett;
HWND hwndPreferences;
BOOL CALLBACK
EnumResLangProc(HMODULE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLanguage, LONG_PTR lParam)
@@ -60,7 +60,7 @@ EnumResLangProc(HMODULE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLan
/* Load available languages */
static void
progsett_fill_languages(HWND hdlg)
preferences_fill_languages(HWND hdlg)
{
temp_language = GetThreadUILanguage();
HWND lang_combo = GetDlgItem(hdlg, IDC_COMBO_LANG);
@@ -79,7 +79,7 @@ progsett_fill_languages(HWND hdlg)
/* Load available iconsets */
static void
progsett_fill_iconsets(HWND hdlg)
preferences_fill_iconsets(HWND hdlg)
{
HWND icon_combo = GetDlgItem(hdlg, IDC_COMBO_ICON);
@@ -154,7 +154,7 @@ progsett_fill_iconsets(HWND hdlg)
/* This returns 1 if any variable has changed, 0 if not. */
static int
progsett_settings_changed(void)
preferences_settings_changed(void)
{
int i = 0;
@@ -167,7 +167,7 @@ progsett_settings_changed(void)
/* IndexOf by ItemData */
static int
progsett_indexof(HWND combo, LPARAM itemdata)
preferences_indexof(HWND combo, LPARAM itemdata)
{
int i;
for (i = 0; i < SendMessage(combo, CB_GETCOUNT, 0, 0); i++)
@@ -179,7 +179,7 @@ progsett_indexof(HWND combo, LPARAM itemdata)
/* This saves the settings back to the global variables. */
static void
progsett_settings_save(void)
preferences_settings_save(void)
{
/* Language */
set_language(temp_language);
@@ -205,23 +205,23 @@ static LRESULT CALLBACK
#else
static BOOL CALLBACK
#endif
ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
PreferencesDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message) {
case WM_INITDIALOG:
hwndProgSett = hdlg;
hwndPreferences = hdlg;
/* Language */
temp_language = lang_id;
strcpy(temp_icon_set, icon_set);
progsett_fill_languages(hdlg);
progsett_fill_iconsets(hdlg);
preferences_fill_languages(hdlg);
preferences_fill_iconsets(hdlg);
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
if (progsett_settings_changed())
progsett_settings_save();
if (preferences_settings_changed())
preferences_settings_save();
EndDialog(hdlg, 0);
return TRUE;
@@ -247,7 +247,7 @@ ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
case IDC_BUTTON_DEFAULT: {
HWND combo = GetDlgItem(hdlg, IDC_COMBO_LANG);
int index = progsett_indexof(combo, DEFAULT_LANGUAGE);
int index = preferences_indexof(combo, DEFAULT_LANGUAGE);
SendMessage(combo, CB_SETCURSEL, index, 0);
temp_language = DEFAULT_LANGUAGE;
break;
@@ -286,7 +286,7 @@ ProgSettDlgProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
void
ProgSettDlgCreate(HWND hwnd)
PreferencesDlgCreate(HWND hwnd)
{
DialogBox(hinstance, (LPCTSTR)DLG_PROG_SETT, hwnd, ProgSettDlgProcedure);
DialogBox(hinstance, (LPCTSTR)DLG_PREFERENCES, hwnd, PreferencesDlgProcedure);
}

4
src/win/win_ui.c
View File

@@ -804,8 +804,8 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
config_save();
break;
case IDM_VID_PROG_SETT:
ProgSettDlgCreate(hwnd);
case IDM_PREFERENCES:
PreferencesDlgCreate(hwnd);
break;
case IDM_VID_SPECIFY_DIM: