Index: src/lang/english.txt =================================================================== --- src/lang/english.txt (revision 10002) +++ src/lang/english.txt (working copy) @@ -3225,6 +3225,7 @@ STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Toggle transparency for buildables like stations, depots, waypoints and catenary STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Toggle transparency for bridges STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Toggle transparency for structures like lighthouses and antennas, maybe in future for eyecandy +STR_TRANSPARENT_MEMO_DESC :{BLACK}Toggle memorization for active transparencies ##### Mass Order STR_GROUP_NAME_FORMAT :Group {COMMA} Index: src/main_gui.cpp =================================================================== --- src/main_gui.cpp (revision 10002) +++ src/main_gui.cpp (working copy) @@ -153,11 +153,12 @@ { static byte trans_opt = ~0; - if (GB(_transparent_opt, 1, 7) == 0) { - SB(_transparent_opt, 1, 7, GB(trans_opt, 1, 7)); + if (GB(_transparent_opt, 2, 8) == 0) { + if (GB(_transparent_opt, 1, 1)) SB(_transparent_opt, 2, 8, GB(trans_opt, 2, 8)); + else SB(_transparent_opt, 2, 8, ~0); } else { - trans_opt = _transparent_opt; - SB(_transparent_opt, 1, 7, 0); + if (GB(_transparent_opt, 1, 1)) trans_opt = _transparent_opt; + SB(_transparent_opt, 2, 8, 0); } MarkWholeScreenDirty(); Index: src/openttd.h =================================================================== --- src/openttd.h (revision 10002) +++ src/openttd.h (working copy) @@ -183,6 +183,7 @@ enum { TO_SIGNS, + TO_MEMO, TO_TREES, TO_HOUSES, TO_INDUSTRIES, Index: src/transparency_gui.cpp =================================================================== --- src/transparency_gui.cpp (revision 10002) +++ src/transparency_gui.cpp (working copy) @@ -15,6 +15,7 @@ enum TransparencyToolbarWidgets{ /* Widgets not toggled when pressing the X key */ TTW_WIDGET_SIGNS = 3, ///< Make signs background transparent + TTW_WIDGET_SAVE, ///< Save the active transparency options /* Widgets toggled when pressing the X key */ TTW_WIDGET_TREES, ///< Make trees transparent @@ -59,24 +60,25 @@ static const Widget _transparency_widgets[] = { { WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, -{ WWT_CAPTION, RESIZE_NONE, 7, 11, 162, 0, 13, STR_TRANSPARENCY_TOOLB, STR_018C_WINDOW_TITLE_DRAG_THIS}, -{WWT_STICKYBOX, RESIZE_NONE, 7, 163, 174, 0, 13, STR_NULL, STR_STICKY_BUTTON}, +{ WWT_CAPTION, RESIZE_NONE, 7, 11, 184, 0, 13, STR_TRANSPARENCY_TOOLB, STR_018C_WINDOW_TITLE_DRAG_THIS}, +{WWT_STICKYBOX, RESIZE_NONE, 7, 185, 196, 0, 13, STR_NULL, STR_STICKY_BUTTON}, /* transparency widgets: * transparent signs, trees, houses, industries, player's buildings, bridges and unmovable structures */ { WWT_IMGBTN, RESIZE_NONE, 7, 0, 21, 14, 35, SPR_IMG_SIGN, STR_TRANSPARENT_SIGNS_DESC}, -{ WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_PLANTTREES, STR_TRANSPARENT_TREES_DESC}, -{ WWT_IMGBTN, RESIZE_NONE, 7, 44, 65, 14, 35, SPR_IMG_TOWN, STR_TRANSPARENT_HOUSES_DESC}, -{ WWT_IMGBTN, RESIZE_NONE, 7, 66, 87, 14, 35, SPR_IMG_INDUSTRY, STR_TRANSPARENT_INDUSTRIES_DESC}, -{ WWT_IMGBTN, RESIZE_NONE, 7, 88, 109, 14, 35, SPR_IMG_COMPANY_LIST, STR_TRANSPARENT_BUILDINGS_DESC}, -{ WWT_IMGBTN, RESIZE_NONE, 7, 110, 152, 14, 35, SPR_IMG_BRIDGE, STR_TRANSPARENT_BRIDGES_DESC}, -{ WWT_IMGBTN, RESIZE_NONE, 7, 153, 174, 14, 35, SPR_IMG_TRANSMITTER, STR_TRANSPARENT_STRUCTURES_DESC}, +{ WWT_IMGBTN, RESIZE_NONE, 7, 22, 43, 14, 35, SPR_IMG_SAVE, STR_TRANSPARENT_MEMO_DESC}, +{ WWT_IMGBTN, RESIZE_NONE, 7, 44, 65, 14, 35, SPR_IMG_PLANTTREES, STR_TRANSPARENT_TREES_DESC}, +{ WWT_IMGBTN, RESIZE_NONE, 7, 66, 87, 14, 35, SPR_IMG_TOWN, STR_TRANSPARENT_HOUSES_DESC}, +{ WWT_IMGBTN, RESIZE_NONE, 7, 88, 109, 14, 35, SPR_IMG_INDUSTRY, STR_TRANSPARENT_INDUSTRIES_DESC}, +{ WWT_IMGBTN, RESIZE_NONE, 7, 110, 131, 14, 35, SPR_IMG_COMPANY_LIST, STR_TRANSPARENT_BUILDINGS_DESC}, +{ WWT_IMGBTN, RESIZE_NONE, 7, 132, 174, 14, 35, SPR_IMG_BRIDGE, STR_TRANSPARENT_BRIDGES_DESC}, +{ WWT_IMGBTN, RESIZE_NONE, 7, 175, 196, 14, 35, SPR_IMG_TRANSMITTER, STR_TRANSPARENT_STRUCTURES_DESC}, { WIDGETS_END}, }; static const WindowDesc _transparency_desc = { - WDP_ALIGN_TBR, 58+36, 175, 36, + WDP_ALIGN_TBR, 58+36, 197, 36, WC_TRANSPARENCY_TOOLBAR, WC_NONE, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, _transparency_widgets,