From b4b3c868dde397444baf3d2267756afe8f073b4a Mon Sep 17 00:00:00 2001 From: CnC-RaVaGe Date: Sun, 1 Sep 2024 07:03:36 +0100 Subject: [PATCH] Combined terrain and main toolbar. Resized toolbar buttons and added new icons. Adjusted toolbar sizes. Added DPI aware property to manifest. --- MissionEditor/FinalSunDlg.cpp | 61 ++++++++++-------- MissionEditor/MissionEditor.rc | 31 ++++++--- MissionEditor/MissionEditor.vcxproj | 1 + MissionEditor/MissionEditor.vcxproj.filters | 3 + .../PropertySheets/FinalAlert2YR.props | 1 + .../PropertySheets/force_utf8.manifest | 2 + MissionEditor/res/Toolbar.bmp | Bin 478 -> 6774 bytes MissionEditor/res/clifftoo.bmp | Bin 598 -> 2678 bytes MissionEditor/res/terrainb.bmp | Bin 1318 -> 1318 bytes MissionEditor/res/toolbar.pal | Bin 0 -> 88 bytes MissionEditor/resource.h | 12 ++-- 11 files changed, 69 insertions(+), 42 deletions(-) create mode 100644 MissionEditor/res/toolbar.pal diff --git a/MissionEditor/FinalSunDlg.cpp b/MissionEditor/FinalSunDlg.cpp index 9a9b46e..d03d1bb 100644 --- a/MissionEditor/FinalSunDlg.cpp +++ b/MissionEditor/FinalSunDlg.cpp @@ -279,56 +279,61 @@ BOOL CFinalSunDlg::OnInitDialog() success = success && m_bar.Create(RBS_AUTOSIZE, r, this, 5000); success = success && m_maintoolbar.Create(this); success = success && m_maintoolbar.LoadToolBar(IDR_MAINFRAME); - m_maintoolbar.GetToolBarCtrl().SetStyle(m_maintoolbar.GetToolBarCtrl().GetStyle() | TBSTYLE_FLAT | TBSTYLE_TRANSPARENT | TBSTYLE_TOOLTIPS); + m_maintoolbar.GetToolBarCtrl().SetStyle(m_maintoolbar.GetToolBarCtrl().GetStyle() | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS); success = success && m_maintoolbar.GetToolBarCtrl().GetMaxSize(&size_mainbar); - success = success && m_terraintoolbar.Create(this); - success = success && m_terraintoolbar.LoadToolBar(IDR_TERRAINBAR); - m_terraintoolbar.GetToolBarCtrl().SetStyle(m_terraintoolbar.GetToolBarCtrl().GetStyle() | TBSTYLE_FLAT | TBSTYLE_TRANSPARENT | TBSTYLE_TOOLTIPS ); - success = success && m_terraintoolbar.GetToolBarCtrl().GetMaxSize(&size_terrainbar); - m_terraintoolbar.SetBarStyle(m_terraintoolbar.GetBarStyle()); - success = success && m_clifftoolbar.Create(this); - success = success && m_clifftoolbar.LoadToolBar(IDR_CLIFFBAR); - m_clifftoolbar.GetToolBarCtrl().SetStyle(m_clifftoolbar.GetToolBarCtrl().GetStyle() | TBSTYLE_FLAT | TBSTYLE_TRANSPARENT | TBSTYLE_TOOLTIPS ); - m_clifftoolbar.SetBarStyle(m_terraintoolbar.GetBarStyle()); - + //YR Redux: merged toolbars + //success = success && m_terraintoolbar.Create(this); + //success = success && m_terraintoolbar.LoadToolBar(IDR_TERRAINBAR); + //m_terraintoolbar.GetToolBarCtrl().SetStyle(m_terraintoolbar.GetToolBarCtrl().GetStyle() | TBSTYLE_FLAT | TBSTYLE_TRANSPARENT | TBSTYLE_TOOLTIPS ); + //success = success && m_terraintoolbar.GetToolBarCtrl().GetMaxSize(&size_terrainbar); + //m_terraintoolbar.SetBarStyle(m_terraintoolbar.GetBarStyle()); + //YR Redux: removed cliff toolbar + //success = success && m_clifftoolbar.Create(this); + //success = success && m_clifftoolbar.LoadToolBar(IDR_CLIFFBAR); + //m_clifftoolbar.GetToolBarCtrl().SetStyle(m_clifftoolbar.GetToolBarCtrl().GetStyle() | TBSTYLE_FLAT | TBSTYLE_TRANSPARENT | TBSTYLE_TOOLTIPS ); + //m_clifftoolbar.SetBarStyle(m_terraintoolbar.GetBarStyle()); success = success && m_settingsbar.Create(this, IDD_TOOLSETTINGS, CBRS_TOP, 6000); - + REBARBANDINFO rbi = { 0 }; rbi.cbSize= sizeof(REBARBANDINFO); - rbi.fMask= RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_TEXT /*| RBBIM_SIZE*/ | RBBIM_IDEALSIZE; - rbi.fStyle= RBBS_GRIPPERALWAYS; + rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_TEXT | RBBS_FIXEDSIZE ; + rbi.fStyle= RBBS_NOGRIPPER; rbi.cxMinChild= size_mainbar.cx+30; - rbi.cyMinChild= 30; + rbi.cyMinChild= 48; rbi.cch= 0; rbi.cx= size_mainbar.cx+30; rbi.cxIdeal=size_mainbar.cx+30; rbi.hbmBack= NULL; rbi.hwndChild= (HWND)m_maintoolbar; success = success && m_bar.InsertBand(0, &rbi); - rbi.hwndChild= (HWND)m_terraintoolbar; - rbi.cx=size_terrainbar.cx+30; - rbi.cxIdeal=size_terrainbar.cx+30; - rbi.cxMinChild= size_terrainbar.cx+30; - success = success && m_bar.InsertBand(1, &rbi); - rbi.hwndChild = (HWND)m_clifftoolbar; - rbi.cx = 560; - rbi.cxMinChild = 170; - rbi.cxIdeal = 560; - success = success && m_bar.InsertBand(2, &rbi); + //YR Redux: merged toolbars + //rbi.hwndChild= (HWND)m_terraintoolbar; + //rbi.cx=size_terrainbar.cx+30; + //rbi.cxIdeal=size_terrainbar.cx+30; + //rbi.cxMinChild= size_terrainbar.cx+30; + //success = success && m_bar.InsertBand(1, &rbi); + //YR Redux: Removed cliff toolbar + //rbi.hwndChild = (HWND)m_clifftoolbar; + //rbi.cx = 560; + //rbi.cxMinChild = 170; + //rbi.cxIdeal = 560; + //success = success && m_bar.InsertBand(2, &rbi); rbi.hwndChild= (HWND)m_settingsbar; + rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_TEXT | RBBS_FIXEDSIZE; + rbi.fStyle = RBBS_NOGRIPPER; rbi.cxMinChild= 170; rbi.cx=170; rbi.cxIdeal=170; - success = success && m_bar.InsertBand(3, &rbi); + success = success && m_bar.InsertBand(1, &rbi); m_bar.ShowWindow(SW_SHOW); m_maintoolbar.ShowWindow(SW_SHOW); - m_terraintoolbar.ShowWindow(SW_SHOW); + //m_terraintoolbar.ShowWindow(SW_SHOW); m_settingsbar.ShowWindow(SW_SHOW); m_bar.MinimizeBand(0); - m_bar.MaximizeBand(3); + m_bar.MaximizeBand(1); diff --git a/MissionEditor/MissionEditor.rc b/MissionEditor/MissionEditor.rc index 78b561d..d80ba0e 100644 --- a/MissionEditor/MissionEditor.rc +++ b/MissionEditor/MissionEditor.rc @@ -1086,10 +1086,10 @@ IDD_TERRAINBAR DIALOG 0, 0, 387, 29 STYLE DS_SETFONT | WS_CHILD FONT 8, "MS Sans Serif" BEGIN - LTEXT "Terrain / Ground:",IDC_STATIC,7,7,32,20 - COMBOBOX IDC_TILESET,42,7,141,169,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Overlay && Special:",IDC_STATIC,204,7,32,20 - COMBOBOX IDC_OVERLAY,239,7,141,169,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "TILESET",IDC_STATIC,8,11,32,20 + COMBOBOX IDC_TILESET,42,9,128,86,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "OVERLAY",IDC_STATIC,186,11,36,20 + COMBOBOX IDC_OVERLAY,224,9,128,86,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_TOOLSETTINGS DIALOGEX 0, 0, 116, 17 @@ -1097,8 +1097,8 @@ STYLE DS_SETFONT | WS_CHILD EXSTYLE WS_EX_TRANSPARENT FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Brush size:",IDC_STATIC,7,3,46,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT - COMBOBOX IDC_BRUSHSIZE,58,1,51,79,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "BRUSH",IDC_STATIC,8,4,28,11,SS_CENTERIMAGE,WS_EX_TRANSPARENT + COMBOBOX IDC_BRUSHSIZE,38,4,36,86,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SHUTDOWN DIALOG 0, 0, 186, 35 @@ -3367,11 +3367,24 @@ END // Toolbar // -IDR_MAINFRAME TOOLBAR 16, 15 +IDR_MAINFRAME TOOLBAR 32, 32 BEGIN BUTTON ID_FILE_NEW BUTTON ID_FILE_OPENMAP BUTTON ID_FILE_SAVE + SEPARATOR + BUTTON ID_MARBLEMADNESS + SEPARATOR + BUTTON ID_TERRAIN_HEIGHTENGROUND + BUTTON ID_TERRAIN_LOWERGROUND + BUTTON ID_TERRAIN_RAISETILE + BUTTON ID_TERRAIN_LOWERTILE + BUTTON ID_TERRAIN_FLATTEN + SEPARATOR + BUTTON ID_TERRAIN_CLOAK + BUTTON ID_TERRAIN_SHOWEVERYTILE + BUTTON ID_TERRAIN_HIDEFIELD + BUTTON ID_TERRAIN_SHOWALLFIELDS END IDR_TERRAINBAR TOOLBAR 16, 15 @@ -3389,13 +3402,15 @@ BEGIN BUTTON ID_MARBLEMADNESS END -IDR_CLIFFBAR TOOLBAR 16, 15 +IDR_CLIFFBAR TOOLBAR 32, 32 BEGIN BUTTON ID_MAPTOOLS_FRONTCLIFF BUTTON ID_MAPTOOLS_BACKCLIFF SEPARATOR BUTTON ID_MAPTOOLS_AUTOLEVEL BUTTON ID_MAPTOOLS_AUTOCREATESHORES + BUTTON ID_BUTTON40154 + BUTTON ID_BUTTON40155 END diff --git a/MissionEditor/MissionEditor.vcxproj b/MissionEditor/MissionEditor.vcxproj index 825ae6e..6116f58 100644 --- a/MissionEditor/MissionEditor.vcxproj +++ b/MissionEditor/MissionEditor.vcxproj @@ -462,6 +462,7 @@ + diff --git a/MissionEditor/MissionEditor.vcxproj.filters b/MissionEditor/MissionEditor.vcxproj.filters index 0f0da59..949768d 100644 --- a/MissionEditor/MissionEditor.vcxproj.filters +++ b/MissionEditor/MissionEditor.vcxproj.filters @@ -618,6 +618,9 @@ Resource Files + + Resource Files + diff --git a/MissionEditor/PropertySheets/FinalAlert2YR.props b/MissionEditor/PropertySheets/FinalAlert2YR.props index 33d68f2..592eeaa 100644 --- a/MissionEditor/PropertySheets/FinalAlert2YR.props +++ b/MissionEditor/PropertySheets/FinalAlert2YR.props @@ -6,5 +6,6 @@ FinalAlert2YR + true \ No newline at end of file diff --git a/MissionEditor/PropertySheets/force_utf8.manifest b/MissionEditor/PropertySheets/force_utf8.manifest index ceeb4d0..0dbab89 100644 --- a/MissionEditor/PropertySheets/force_utf8.manifest +++ b/MissionEditor/PropertySheets/force_utf8.manifest @@ -2,6 +2,8 @@ + true + PerMonitorV2 UTF-8 diff --git a/MissionEditor/res/Toolbar.bmp b/MissionEditor/res/Toolbar.bmp index f8137dde8282fe25b4364ecfb3462b47f9806b4c..696927e0f98790b93834dcb1bd0dc7ea4638d869 100644 GIT binary patch literal 6774 zcmeH~J5n1#5QYcYRj4o&jvY~(;LugRfpgzwO94x`nK=eAk#i?H0D&&xJCG5|{r78n zW|3AxTLf4GyYt+c|Lg8;Nk4wxd`Vnx=>CY~wu8!kb`qRFdxSWV?i-jZit^RyR#SLcrg)EGr) zEmDu-oE;D3?!dns@n#=ptoiookNKzOAsp}+kP9c(VsF8*UI(0OT<(p|V_ApletTL1 zw6m)Ucgy^qJiuWd1qv9VSO*+HP$JO4AJzK^u~Be4YnlkOeSVw==1WQQK}$Ho^C&h` z;Wd}_4aDjfm;5&1QQ_tfXs~K2dERbnPSir$1NHh}zQGmpIP@o}s zFb^q3QH41VXbT|iX@Nu5w&iXOY~gZMD$r(_fQLk|%m7T#GL8Wq%%hUzjLwCUM`Val zphtPxW1$bBR$L_Kw`_k3wwcRiFWE{1#tyssr{{E#=K1|uo!wKy)_kBGMHQ_G0Fo1N zqQ8s@BET31u`0g5Vxz8=b zH4k}0AC0$~2RIDmClsF+B(C~Akw_QOf&noRD2u}?^x_DBT<+++@X(I}kvI7MHm`UD z2S6Kn5TGJo??IhmSj{U2%fkZz@MJCfnB+}=AW)rp!XRsuurTu2tTL?^NU` zgZy5o;*G>IP{1ke{{l~Ce}W0=n>GY*u+FP6{2}F0_jK%^Z#Y4Ndcea#0SD=9@B;Yu z+^D8Y@6d|MpXI}Q_LRr$!#vi(RuC)2H*U`goNf6`o~iYY{a*ExUeVBeU{A91t+T1F s^;P!Y+urqlo6g;3oB<9D-$V5r`ur}OZ@K2Z@w}z&j%OV$FqsAZ0aM4ho&W#< literal 478 zcma)&u@S;B3`La-cPX<5W$v;8J$q29LTyH3gJcqBaG%0F$qttQ1>crre@oxCF4t!x zfjj<;4Oovga>9$;>UnGqZW3Y2G?jp7Da*1D{UFDboPC8coWj|^pbm7V5w~DEvbPo< zwVX`b5wQK_lk>wjKbL~Ymz~a93e?L&ugwdL;)Q&M#1(eewUi`hWFgV``9=POF+5ua zJQz&}j9^RXGQ%UGx8oV3Gd#diSK+5KexQ`_Ljp29VGzMqJod}*NaKSQJWgPmKTcrG zpHhb$&+0nA)p&;L{E)x}Kdz~d2e*)jRz?FWn;XoCbm+?<@&R{JC^ZI`}s5RcfXXX9bV$@id*6ZddbX9s{3C} i`$%sSNaE!29z{=G@nZIqFKtt==jFrbZ6onpyuJW07`a{m literal 598 zcmZ{h!EM7Z3`Kv80s(aC3WiP{!zcpe)NAI*AtnqiypQ#`G{UE~EcwP^rq8+!;RWn@b4+j?85~#%Lb?3FW)6>Hq)$ diff --git a/MissionEditor/res/terrainb.bmp b/MissionEditor/res/terrainb.bmp index 48aefacb6e095e6ccf0c67740140edb43caf8337..214e0ea37b9b068dcb5b77c78226dd1cb85ae239 100644 GIT binary patch delta 16 XcmZ3+wTx?m9;*NY1B1Xu delta 16 VcmZ3+wTx?m9xDR~Y&8DN0stb<1OEU3 diff --git a/MissionEditor/res/toolbar.pal b/MissionEditor/res/toolbar.pal new file mode 100644 index 0000000000000000000000000000000000000000..010878ee39e54364cd0843a807767eb2c482f03f GIT binary patch literal 88 zcmWIYbaM+}U|(o_zz|L JhjRV{1pq