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 f8137dd..696927e 100644
Binary files a/MissionEditor/res/Toolbar.bmp and b/MissionEditor/res/Toolbar.bmp differ
diff --git a/MissionEditor/res/clifftoo.bmp b/MissionEditor/res/clifftoo.bmp
index 1111c17..9d2d497 100644
Binary files a/MissionEditor/res/clifftoo.bmp and b/MissionEditor/res/clifftoo.bmp differ
diff --git a/MissionEditor/res/terrainb.bmp b/MissionEditor/res/terrainb.bmp
index 48aefac..214e0ea 100644
Binary files a/MissionEditor/res/terrainb.bmp and b/MissionEditor/res/terrainb.bmp differ
diff --git a/MissionEditor/res/toolbar.pal b/MissionEditor/res/toolbar.pal
new file mode 100644
index 0000000..010878e
Binary files /dev/null and b/MissionEditor/res/toolbar.pal differ
diff --git a/MissionEditor/resource.h b/MissionEditor/resource.h
index b630409..780cf26 100644
--- a/MissionEditor/resource.h
+++ b/MissionEditor/resource.h
@@ -1,12 +1,11 @@
//{{NO_DEPENDENCIES}}
-// Von Microsoft Visual C++ generierte Includedatei.
-// Verwendet durch MissionEditor.rc
+// Microsoft Visual C++ generated include file.
+// Used by MissionEditor.rc
//
#define IDD_TIBERIANSUNMISSIONEDITOR_DIALOG 102
#define IDD_FINALSUN_DIALOG 102
#define IDB_LIGHTBULB 103
#define IDD_TIP 104
-
#define IDR_MAINFRAME 128
#define IDR_MAIN 129
#define IDD_BASIC 135
@@ -594,7 +593,8 @@
#define ID_HELP_SHOWLOGS40140 40140
#define ID_OPTIONS_SMOOTHZOOM 40141
#define ID_OPTIONS_USEDEFAULTMOUSECURSOR 40142
-
+#define ID_BUTTON40154 40154
+#define ID_BUTTON40155 40155
#define IDS_LINEARVERSION 57604
#define IDC_TOOLTIPCENTER 65535
@@ -602,8 +602,8 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 300
-#define _APS_NEXT_COMMAND_VALUE 40144
+#define _APS_NEXT_RESOURCE_VALUE 302
+#define _APS_NEXT_COMMAND_VALUE 40158
#define _APS_NEXT_CONTROL_VALUE 1464
#define _APS_NEXT_SYMED_VALUE 111
#endif