Rename tags and prepare for ObjectBrowser update

Author: secsome

CHANGELOG.md

@@ -5,6 +5,10 @@
 - Now buildings whose hp is 0 will be displayed as their rubble frame
     - Currently the rubble will probably be drawn with an incorrect palette
 - New ***ExtConfig*** : `HideNoRubbleBuilding` = **BOOLEAN**, defaults to false, enable it so Buildings with `LeaveRubble=no` will be hide if their HP = 0
+- New ***ExtConfig*** : `ModernObjectBrowser` = **BOOLEAN**, defaults to false, enable it to use the experimental object browser
+- Renamed ***ExtConfig*** : `BrowserRedraw.GuessMode` to `ObjectBrowser.GuessMode`
+- Renamed ***ExtConfig*** : `BrowserRedraw.CleanUp` to `ObjectBrowser.CleanUp`
+- Renamed ***ExtConfig*** : `BrowserRedraw.SafeHouses` to `ObjectBrowser.SafeHouses`
 - Multiselection deselect all hotkey changed from CTRL+D into CTRL+SHIFT+D
 - Added hotkey CTRL+SHIFT+F for Navigate to coordinate
 - SliderCtrl now displays tooltip indicating current strength of the object

DOCUMENT.md

@@ -28,10 +28,12 @@ Now this feature supports RaiseSingleTile/LowerSingleTile (though they are not "
 ## BASIC TYPES
 - FAData.ini
     - [ExtConfigs]
-        - `BrowserRedraw` = **BOOLEAN** ; Enable refactored ObjectBrowserView
-          - `BrowserRedraw.GuessMode` = **$0/1$** ; Determines how FA2sp guess Technos' side, $0$(Default) to Prerequisite, $1$ to use first Owner 
-          - `BrowserRedraw.CleanUp` = **BOOLEAN** ; Sides classification will clear empty items
-          - `BrowserRedraw.SafeHouses` = **BOOLEAN** ; Determines whether FA2sp will rearrangement the houses or not
+        - **ObjectBrowser**, if `ModernObjectBrowser` is enabled, `BrowserRedraw` won't be useful
+            - `BrowserRedraw` = **BOOLEAN** ; Enable refactored ObjectBrowserView 
+            - `ModernObjectBrowser` = **BOOLEAN** ; If this value is true, then experimental object browser will be enabled, replacing the vanilla tree view, defaults to **false**
+                - `ObjectBrowser.GuessMode` = **$0/1$** ; Determines how FA2sp guess Technos' side, $0$(Default) to Prerequisite, $1$ to use first Owner 
+                - `ObjectBrowser.CleanUp` = **BOOLEAN** ; Sides classification will clear empty items
+                - `ObjectBrowser.SafeHouses` = **BOOLEAN** ; Determines whether FA2sp will rearrangement the houses or not
         - `AllowIncludes` = **BOOLEAN** ; Read #include section for other ini (NOT RECOMMENDED) 
         - `AllowPlusEqual` = **BOOLEAN** ; Read += (NOT RECOMMENDED)
         - `TutorialTexts.Fix` = **BOOLEAN** ; Replace original process while loading texts to comboboxes

FA2sp/Ext/CFinalSunDlg/Body.ObjectBrowserControl.cpp

@@ -112,7 +112,7 @@ void CViewObjectsExt::Redraw_Initialize()
     loadSet("VehicleTypes", Set_Vehicle);
     loadSet("AircraftTypes", Set_Aircraft);
 
-    if (ExtConfigs::BrowserRedraw_GuessMode == 1)
+    if (ExtConfigs::ObjectBrowser_GuessMode == 1)
     {
         auto loadOwner = []()
         {
@@ -221,7 +221,7 @@ void CViewObjectsExt::Redraw_Owner()
     HTREEITEM& hOwner = ExtNodes[Root_Owner];
     if (hOwner == NULL)    return;
 
-    if (ExtConfigs::BrowserRedraw_SafeHouses)
+    if (ExtConfigs::ObjectBrowser_SafeHouses)
     {
         if (CMapData::Instance->IsMultiOnly())
         {
@@ -302,7 +302,7 @@ void CViewObjectsExt::Redraw_Infantry()
     }
 
     // Clear up
-    if (ExtConfigs::BrowserRedraw_CleanUp)
+    if (ExtConfigs::ObjectBrowser_CleanUp)
     {
         for (auto& subnode : subNodes)
         {
@@ -351,7 +351,7 @@ void CViewObjectsExt::Redraw_Vehicle()
     }
 
     // Clear up
-    if (ExtConfigs::BrowserRedraw_CleanUp)
+    if (ExtConfigs::ObjectBrowser_CleanUp)
     {
         for (auto& subnode : subNodes)
         {
@@ -401,7 +401,7 @@ void CViewObjectsExt::Redraw_Aircraft()
     }
 
     // Clear up
-    if (ExtConfigs::BrowserRedraw_CleanUp)
+    if (ExtConfigs::ObjectBrowser_CleanUp)
     {
         for (auto& subnode : subNodes)
         {
@@ -451,7 +451,7 @@ void CViewObjectsExt::Redraw_Building()
     }
 
     // Clear up
-    if (ExtConfigs::BrowserRedraw_CleanUp)
+    if (ExtConfigs::ObjectBrowser_CleanUp)
     {
         for (auto& subnode : subNodes)
         {
@@ -991,7 +991,7 @@ int CViewObjectsExt::GuessGenericSide(const char* pRegName, int nType)
     if (set.find(pRegName) == set.end())
         return -1;
 
-    switch (ExtConfigs::BrowserRedraw_GuessMode)
+    switch (ExtConfigs::ObjectBrowser_GuessMode)
     {
     default:
     case 0:

FA2sp/FA2sp.cpp

@@ -19,9 +19,9 @@ std::map<ppmfc::CString, ppmfc::CString> FA2sp::TutorialTextsMap;
 void* FA2sp::pExceptionHandler = nullptr;
 
 bool ExtConfigs::BrowserRedraw;
-int	 ExtConfigs::BrowserRedraw_GuessMode;
-bool ExtConfigs::BrowserRedraw_CleanUp;
-bool ExtConfigs::BrowserRedraw_SafeHouses;
+int	 ExtConfigs::ObjectBrowser_GuessMode;
+bool ExtConfigs::ObjectBrowser_CleanUp;
+bool ExtConfigs::ObjectBrowser_SafeHouses;
 bool ExtConfigs::AllowIncludes;
 bool ExtConfigs::AllowPlusEqual;
 bool ExtConfigs::TutorialTexts_Hide;
@@ -58,16 +58,18 @@ bool ExtConfigs::NoHouseNameTranslation;
 bool ExtConfigs::EnableMultiSelection;
 bool ExtConfigs::ExtendedValidationNoError;
 bool ExtConfigs::HideNoRubbleBuilding;
+bool ExtConfigs::ModernObjectBrowser;
 
 MultimapHelper Variables::Rules = { &CINI::Rules(), &CINI::CurrentDocument() };
 MultimapHelper Variables::FAData = { &CINI::FAData() };
 
 void FA2sp::ExtConfigsInitialize()
 {	
 	ExtConfigs::BrowserRedraw = CINI::FAData->GetBool("ExtConfigs", "BrowserRedraw");
-	ExtConfigs::BrowserRedraw_GuessMode = CINI::FAData->GetInteger("ExtConfigs", "BrowserRedraw.GuessMode", 0);
-	ExtConfigs::BrowserRedraw_CleanUp = CINI::FAData->GetBool("ExtConfigs", "BrowserRedraw.CleanUp");
-	ExtConfigs::BrowserRedraw_SafeHouses = CINI::FAData->GetBool("ExtConfigs", "BrowserRedraw.SafeHouses");
+	ExtConfigs::ModernObjectBrowser = CINI::FAData->GetBool("ExtConfigs", "ModernObjectBrowser");
+	ExtConfigs::ObjectBrowser_GuessMode = CINI::FAData->GetInteger("ExtConfigs", "ObjectBrowser.GuessMode", 0);
+	ExtConfigs::ObjectBrowser_CleanUp = CINI::FAData->GetBool("ExtConfigs", "ObjectBrowser.CleanUp");
+	ExtConfigs::ObjectBrowser_SafeHouses = CINI::FAData->GetBool("ExtConfigs", "ObjectBrowser.SafeHouses");
 
 	ExtConfigs::AllowIncludes = CINI::FAData->GetBool("ExtConfigs", "AllowIncludes");
 	ExtConfigs::AllowPlusEqual = CINI::FAData->GetBool("ExtConfigs", "AllowPlusEqual");

FA2sp/FA2sp.h

@@ -27,9 +27,9 @@ class ExtConfigs
 {
 public:
     static bool BrowserRedraw;
-    static int  BrowserRedraw_GuessMode;
-    static bool BrowserRedraw_CleanUp;
-    static bool BrowserRedraw_SafeHouses;
+    static int  ObjectBrowser_GuessMode;
+    static bool ObjectBrowser_CleanUp;
+    static bool ObjectBrowser_SafeHouses;
     static bool AllowIncludes;
     static bool AllowPlusEqual;
     static bool TutorialTexts_Hide;
@@ -66,6 +66,7 @@ class ExtConfigs
     static bool EnableMultiSelection;
     static bool ExtendedValidationNoError;
     static bool HideNoRubbleBuilding;
+    static bool ModernObjectBrowser;
 };
 
 class Variables