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

Add a menu option to hide the toolbar

Browse Source
This commit is contained in:
David Hrdlička
2022-01-10 01:49:00 +01:00
parent 529889d21e
commit 513100b720
20 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,6 +313,7 @@
#endif #endif
#define IDM_CONFIG 40020 #define IDM_CONFIG 40020
#define IDM_VID_HIDE_STATUS_BAR 40021 #define IDM_VID_HIDE_STATUS_BAR 40021
#define IDM_VID_HIDE_TOOLBAR 40022
#define IDM_UPDATE_ICONS 40030 #define IDM_UPDATE_ICONS 40030
#define IDM_SND_GAIN 40031 #define IDM_SND_GAIN 40031
#define IDM_VID_RESIZE 40040 #define IDM_VID_RESIZE 40040

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Zobrazení" POPUP "&Zobrazení"
BEGIN BEGIN
MENUITEM "&Schovat stavový řádek", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Schovat stavový řádek", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Schovat panel &nástrojů", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Měnitelná velikost okna", IDM_VID_RESIZE MENUITEM "&Měnitelná velikost okna", IDM_VID_RESIZE
MENUITEM "&Pamatovat velikost a pozici", IDM_VID_REMEMBER MENUITEM "&Pamatovat velikost a pozici", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Ansicht" POPUP "&Ansicht"
BEGIN BEGIN
MENUITEM "&Statusleiste ausblenden", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Statusleiste ausblenden", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Größenverstellbares Fenster", IDM_VID_RESIZE MENUITEM "&Größenverstellbares Fenster", IDM_VID_RESIZE
MENUITEM "&Größe && Position merken", IDM_VID_REMEMBER MENUITEM "&Größe && Position merken", IDM_VID_REMEMBER

1
src/win/languages/en-GB.rc
View File

@@ -32,6 +32,7 @@ BEGIN
POPUP "&View" POPUP "&View"
BEGIN BEGIN
MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Resizeable window", IDM_VID_RESIZE MENUITEM "&Resizeable window", IDM_VID_RESIZE
MENUITEM "R&emember size && position", IDM_VID_REMEMBER MENUITEM "R&emember size && position", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&View" POPUP "&View"
BEGIN BEGIN
MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Hide status bar", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Resizeable window", IDM_VID_RESIZE MENUITEM "&Resizeable window", IDM_VID_RESIZE
MENUITEM "R&emember size && position", IDM_VID_REMEMBER MENUITEM "R&emember size && position", IDM_VID_REMEMBER

1
src/win/languages/es-ES.rc
View File

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Vista" POPUP "&Vista"
BEGIN BEGIN
MENUITEM "&Ocultar barra de estado", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Ocultar barra de estado", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Ventana redimensionable", IDM_VID_RESIZE MENUITEM "&Ventana redimensionable", IDM_VID_RESIZE
MENUITEM "&Recordar tamaño y posición", IDM_VID_REMEMBER MENUITEM "&Recordar tamaño y posición", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Näytä" POPUP "&Näytä"
BEGIN BEGIN
MENUITEM "&Piilota tilapalkki", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Piilota tilapalkki", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Salli koon muuttaminen", IDM_VID_RESIZE MENUITEM "&Salli koon muuttaminen", IDM_VID_RESIZE
MENUITEM "&Muista koko ja sijainti", IDM_VID_REMEMBER MENUITEM "&Muista koko ja sijainti", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Vue" POPUP "&Vue"
BEGIN BEGIN
MENUITEM "&Masquer la barre de status", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Masquer la barre de status", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Fenètre &Retaillable", IDM_VID_RESIZE MENUITEM "Fenètre &Retaillable", IDM_VID_RESIZE
MENUITEM "S&auvegarder taille && position", IDM_VID_REMEMBER MENUITEM "S&auvegarder taille && position", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Pogled" POPUP "&Pogled"
BEGIN BEGIN
MENUITEM "&Sakrij statusni redak", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Sakrij statusni redak", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Prozor s promjenjivim veličinama", IDM_VID_RESIZE MENUITEM "&Prozor s promjenjivim veličinama", IDM_VID_RESIZE
MENUITEM "&Zapamtite veličinu i položaj", IDM_VID_REMEMBER MENUITEM "&Zapamtite veličinu i položaj", IDM_VID_REMEMBER

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

@@ -35,6 +35,7 @@ BEGIN
POPUP "&Nézet" POPUP "&Nézet"
BEGIN BEGIN
MENUITEM "Állapotsor &elrejtése", IDM_VID_HIDE_STATUS_BAR MENUITEM "Állapotsor &elrejtése", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Átméretezhető ablak", IDM_VID_RESIZE MENUITEM "&Átméretezhető ablak", IDM_VID_RESIZE
MENUITEM "Méret és pozíció &megjegyzése", IDM_VID_REMEMBER MENUITEM "Méret és pozíció &megjegyzése", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Visualizza" POPUP "&Visualizza"
BEGIN BEGIN
MENUITEM "&Nascondi barra di stato", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Nascondi barra di stato", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Finestra ridimensionabile", IDM_VID_RESIZE MENUITEM "&Finestra ridimensionabile", IDM_VID_RESIZE
MENUITEM "R&icorda dimensioni e posizione", IDM_VID_REMEMBER MENUITEM "R&icorda dimensioni e posizione", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "表示(&V)" POPUP "表示(&V)"
BEGIN BEGIN
MENUITEM "ステータスバーを隠す(&H)", IDM_VID_HIDE_STATUS_BAR MENUITEM "ステータスバーを隠す(&H)", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "ウィンドウのサイズを変更可能にする(&R)", IDM_VID_RESIZE MENUITEM "ウィンドウのサイズを変更可能にする(&R)", IDM_VID_RESIZE
MENUITEM "ウィンドウのサイズと位置を記憶する(&E)", IDM_VID_REMEMBER MENUITEM "ウィンドウのサイズと位置を記憶する(&E)", IDM_VID_REMEMBER

1
src/win/languages/ko-KR.rc
View File

@@ -32,6 +32,7 @@ BEGIN
POPUP "표시(&V)" POPUP "표시(&V)"
BEGIN BEGIN
MENUITEM "상태 바 숨기기(&H)", IDM_VID_HIDE_STATUS_BAR MENUITEM "상태 바 숨기기(&H)", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "창 크기 조절 가능하게 하기(&R)", IDM_VID_RESIZE MENUITEM "창 크기 조절 가능하게 하기(&R)", IDM_VID_RESIZE
MENUITEM "창 크기와 위치를 기억하기(&E)", IDM_VID_REMEMBER MENUITEM "창 크기와 위치를 기억하기(&E)", IDM_VID_REMEMBER

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

@@ -35,6 +35,7 @@ BEGIN
POPUP "&Exibir" POPUP "&Exibir"
BEGIN BEGIN
MENUITEM "&Ocultar barra de status", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Ocultar barra de status", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Janela redimensionável", IDM_VID_RESIZE MENUITEM "&Janela redimensionável", IDM_VID_RESIZE
MENUITEM "&Lembrar tamanho e posição", IDM_VID_REMEMBER MENUITEM "&Lembrar tamanho e posição", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Ver" POPUP "&Ver"
BEGIN BEGIN
MENUITEM "&Ocultar barra de estado", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Ocultar barra de estado", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Janela redimensionável", IDM_VID_RESIZE MENUITEM "&Janela redimensionável", IDM_VID_RESIZE
MENUITEM "&Lembrar tamanho e posição", IDM_VID_REMEMBER MENUITEM "&Lembrar tamanho e posição", IDM_VID_REMEMBER

1
src/win/languages/ru-RU.rc
View File

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Вид" POPUP "&Вид"
BEGIN BEGIN
MENUITEM "&Скрыть строку статуса", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Скрыть строку статуса", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Изменяемый размер окна", IDM_VID_RESIZE MENUITEM "&Изменяемый размер окна", IDM_VID_RESIZE
MENUITEM "&Запомнить размер и положение", IDM_VID_REMEMBER MENUITEM "&Запомнить размер и положение", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Pogled" POPUP "&Pogled"
BEGIN BEGIN
MENUITEM "&Skrij statusno vrstico", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Skrij statusno vrstico", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "S&premenljiva velikost okna", IDM_VID_RESIZE MENUITEM "S&premenljiva velikost okna", IDM_VID_RESIZE
MENUITEM "&Zapomni si velikost in položaj", IDM_VID_REMEMBER MENUITEM "&Zapomni si velikost in položaj", IDM_VID_REMEMBER

1
src/win/languages/tr-TR.rc
View File

@@ -32,6 +32,7 @@ BEGIN
POPUP "&Görüntüleme" POPUP "&Görüntüleme"
BEGIN BEGIN
MENUITEM "&Durum çubuğunu gizle", IDM_VID_HIDE_STATUS_BAR MENUITEM "&Durum çubuğunu gizle", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Yeniden boyutlandırılabilir pencere", IDM_VID_RESIZE MENUITEM "&Yeniden boyutlandırılabilir pencere", IDM_VID_RESIZE
MENUITEM "&Pencere boyut ve pozisyonunu hatırla", IDM_VID_REMEMBER MENUITEM "&Pencere boyut ve pozisyonunu hatırla", IDM_VID_REMEMBER

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

@@ -32,6 +32,7 @@ BEGIN
POPUP "查看(&V)" POPUP "查看(&V)"
BEGIN BEGIN
MENUITEM "隐藏状态栏(&H)", IDM_VID_HIDE_STATUS_BAR MENUITEM "隐藏状态栏(&H)", IDM_VID_HIDE_STATUS_BAR
MENUITEM "Hide &toolbar", IDM_VID_HIDE_TOOLBAR
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "窗口大小可调(&R)", IDM_VID_RESIZE MENUITEM "窗口大小可调(&R)", IDM_VID_RESIZE
MENUITEM "记住窗口大小和位置(&E)", IDM_VID_REMEMBER MENUITEM "记住窗口大小和位置(&E)", IDM_VID_REMEMBER

17
src/win/win_ui.c
View File

@@ -276,6 +276,7 @@ ResetAllMenus(void)
#endif #endif
CheckMenuItem(menuMain, IDM_VID_HIDE_STATUS_BAR, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_HIDE_STATUS_BAR, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_HIDE_TOOLBAR, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_FORCE43, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_FORCE43, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_OVERSCAN, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_OVERSCAN, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_INVERT, MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_INVERT, MF_UNCHECKED);
@@ -344,6 +345,7 @@ ResetAllMenus(void)
#endif #endif
CheckMenuItem(menuMain, IDM_VID_HIDE_STATUS_BAR, hide_status_bar ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_HIDE_STATUS_BAR, hide_status_bar ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_HIDE_TOOLBAR, hide_tool_bar ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_FORCE43, force_43?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_FORCE43, force_43?MF_CHECKED:MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_OVERSCAN, enable_overscan?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_OVERSCAN, enable_overscan?MF_CHECKED:MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_INVERT, invert_display ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(menuMain, IDM_VID_INVERT, invert_display ? MF_CHECKED : MF_UNCHECKED);
@@ -641,6 +643,21 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
config_save(); config_save();
break; break;
case IDM_VID_HIDE_TOOLBAR:
hide_tool_bar ^= 1;
CheckMenuItem(hmenu, IDM_VID_HIDE_TOOLBAR, hide_tool_bar ? MF_CHECKED : MF_UNCHECKED);
ShowWindow(hwndRebar, hide_tool_bar ? SW_HIDE : SW_SHOW);
GetWindowRect(hwnd, &rect);
if (hide_tool_bar) {
MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top - tbar_height, TRUE);
SetWindowPos(hwndRender, NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
} else {
MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top + tbar_height, TRUE);
SetWindowPos(hwndRender, NULL, 0, tbar_height, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
}
config_save();
break;
case IDM_VID_RESIZE: case IDM_VID_RESIZE:
vid_resize ^= 1; vid_resize ^= 1;
CheckMenuItem(hmenu, IDM_VID_RESIZE, (vid_resize & 1) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hmenu, IDM_VID_RESIZE, (vid_resize & 1) ? MF_CHECKED : MF_UNCHECKED);