Show portal type description under bottom right status strip when sel…

…ecting portals in Map.wz
lastbattle · Jun 9, 2018 · c5b571f · c5b571f
1 parent 0e962cf
commit c5b571f
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 29 deletions.
diff --git a/HaRepackerLib/Controls/HaRepackerMainPanels/HaRepackerMainPanel.Designer.cs b/HaRepackerLib/Controls/HaRepackerMainPanels/HaRepackerMainPanel.Designer.cs
diff --git a/HaRepackerLib/Controls/HaRepackerMainPanels/HaRepackerMainPanel.cs b/HaRepackerLib/Controls/HaRepackerMainPanels/HaRepackerMainPanel.cs
@@ -90,6 +90,7 @@ private void ShowObjectValue(WzObject obj)
             mp3Player.SoundProperty = null;
             nameBox.Text = obj is WzFile ? ((WzFile)obj).Header.Copyright : obj.Name;
             nameBox.ButtonEnabled = false;
+            toolStripStatusLabel_additionalInfo.Text = "-"; // Reset additional info to default
 
             if (obj is WzFile || obj is WzDirectory || obj is WzImage || obj is WzNullProperty || obj is WzSubProperty || obj is WzConvexProperty)
             {
@@ -128,7 +129,7 @@ private void ShowObjectValue(WzObject obj)
                 saveImageButton.Visible = true;
                 changeSoundButton.Visible = false;
                 saveSoundButton.Visible = false;
-            }
+            } 
             else if (obj is WzUOLProperty)
             {
                 nameBox.Visible = true;
@@ -150,8 +151,7 @@ private void ShowObjectValue(WzObject obj)
                     saveImageButton.Visible = true;
 
                     textPropBox.Size = new Size(textPropBox.Size.Width, 50);
-                }
-                else
+                } else
                 {
 
                     canvasPropBox.Visible = false;
@@ -190,6 +190,24 @@ private void ShowObjectValue(WzObject obj)
                 saveImageButton.Visible = false;
                 changeSoundButton.Visible = false;
                 saveSoundButton.Visible = false;
+
+                if (obj is WzStringProperty)
+                {
+                    WzStringProperty stringObj = (WzStringProperty)obj;
+
+                    // Portal type name display
+                    if (stringObj.Name == "pn") // "pn" = portal name
+                    {
+                        if (MapleLib.WzLib.WzStructure.Data.Tables.PortalTypeNames.ContainsKey(obj.GetString()))
+                        {
+                            toolStripStatusLabel_additionalInfo.Text = 
+                                string.Format(Properties.Resources.MainAdditionalInfo_PortalType,  MapleLib.WzLib.WzStructure.Data.Tables.PortalTypeNames[obj.GetString()]);
+                        } else
+                        {
+                            toolStripStatusLabel_additionalInfo.Text = string.Format(Properties.Resources.MainAdditionalInfo_PortalType, obj.GetString());
+                        }
+                    }
+                }
             }
             else if (obj is WzVectorProperty)
             {
@@ -244,7 +262,7 @@ private static void ParseOnDataTreeSelectedItem(WzNode selectedNode)
         /// <param name="e"></param>
         private void saveImageButton_Click(object sender, EventArgs e)
         {
-            if (!(DataTree.SelectedNode.Tag is WzCanvasProperty) && !(DataTree.SelectedNode.Tag is WzUOLProperty))
+            if (!(DataTree.SelectedNode.Tag is WzCanvasProperty) && !(DataTree.SelectedNode.Tag is WzUOLProperty)) 
             {
                 return;
             }
@@ -709,8 +727,7 @@ private void changeImageButton_Click(object sender, EventArgs e)
                     // Add undo actions
                     //actions.Add(UndoRedoManager.ObjectRemoved((WzNode)parentCanvasNode, childInlinkNode));
                     childInlinkNode.Delete(); // Delete '_inlink' node
-                }
-                else if (selectedWzCanvas.HaveOutlinkProperty()) // if its an inlink property, remove that before updating base image.
+                } else if (selectedWzCanvas.HaveOutlinkProperty()) // if its an inlink property, remove that before updating base image.
                 {
                     selectedWzCanvas.RemoveProperty(selectedWzCanvas[WzCanvasProperty.OutlinkPropertyName]);
 
@@ -725,7 +742,7 @@ private void changeImageButton_Click(object sender, EventArgs e)
 
                 }
                 selectedWzCanvas.PngProperty.SetPNG(bmp);
-
+ 
                 // Updates
                 selectedWzCanvas.ParentImage.Changed = true;
                 canvasPropBox.Image = bmp;
@@ -818,7 +835,7 @@ public void DoRemoveImageResource()
             foreach (WzNode node in DataTree.SelectedNodes)
             {
                 WzObject wzObj = (WzObject)node.Tag;// CloneWzObject((WzObject)node.Tag);
-
+            
             }
         }
 
@@ -1091,11 +1108,11 @@ private void btnFindAll_Click(object sender, EventArgs e)
                 dsr.searchResultsBox.Items.Add(result);
             dsr.Show(MainDockPanel);
             dsr.DockState = DockState.DockBottom;
-            //            searchResults.AutoHide = false;
-            //            searchResults.Visible = true;
-            //            searchResultsContainer.Visible = true;
-            //            dockSite8.Visible = true;
-            //            panelDockContainer1.Visible = true;
+//            searchResults.AutoHide = false;
+//            searchResults.Visible = true;
+//            searchResultsContainer.Visible = true;
+//            dockSite8.Visible = true;
+//            panelDockContainer1.Visible = true;
             findBox.Focus();
         }
 
@@ -1132,9 +1149,9 @@ private void searchResultsContainer_VisibleChanged(object sender, System.EventAr
 
         private WzNode GetNodeByName(TreeNodeCollection collection, string name)
         {
-            foreach (WzNode node in collection)
-                if (node.Text == name)
-                    return node;
+            foreach (WzNode node in collection) 
+                if (node.Text == name) 
+                    return node; 
             return null;
         }
 

diff --git a/HaRepackerLib/Controls/HaRepackerMainPanels/HaRepackerMainPanel.resx b/HaRepackerLib/Controls/HaRepackerMainPanels/HaRepackerMainPanel.resx
@@ -137,7 +137,7 @@
   <data name="DataTree.SelectedNodes" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAEAQAAABxTeXN0ZW0uQ29sbGVjdGlvbnMuQXJyYXlMaXN0AwAAAAZfaXRl
-        bXMFX3NpemUIX3ZlcnNpb24FAAAICAkCAAAAAAAAAAEAAAAQAgAAAAAAAAAL
+        bXMFX3NpemUIX3ZlcnNpb24FAAAICAkCAAAAAAAAAAIAAAAQAgAAAAAAAAAL
 </value>
   </data>
   <data name="DataTree.Size" type="System.Drawing.Size, System.Drawing">
@@ -552,6 +552,12 @@
   <data name="secondaryProgressBar.Size" type="System.Drawing.Size, System.Drawing">
     <value>150, 25</value>
   </data>
+  <data name="toolStripStatusLabel_additionalInfo.Size" type="System.Drawing.Size, System.Drawing">
+    <value>19, 26</value>
+  </data>
+  <data name="toolStripStatusLabel_additionalInfo.Text" xml:space="preserve">
+    <value>-</value>
+  </data>
   <data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 671</value>
   </data>
@@ -771,6 +777,12 @@
   <data name="&gt;&gt;btnOptions.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;toolStripStatusLabel_additionalInfo.Name" xml:space="preserve">
+    <value>toolStripStatusLabel_additionalInfo</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusLabel_additionalInfo.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>HaRepackerMainPanel</value>
   </data>

diff --git a/HaRepackerLib/Controls/HaRepackerMainPanels/HaRepackerMainPanel.zh-CHT.resx b/HaRepackerLib/Controls/HaRepackerMainPanels/HaRepackerMainPanel.zh-CHT.resx
@@ -165,17 +165,17 @@
   </data>
   <data name="btnOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAgNJREFUOE+lkutLk2EYxvePhJaHShFBUTEPiCieQOmDiEZgrEbpYGiCQxkqA80I
+        RUkUEZ0YRMS+DDI70MkTmzJnDc8iU8QT2mAEItnle90wHwTDyBduXnie5/rd133Q4ZKfAJqHFs9E08A8
+        zD1emDpmYXjqRlnTFIrMk8iuGkNaxWekGEaQrHecBfw+/vPXODw6hj9whN2fh/Bt/8LSRgA3cxr/DeBZ
+        9kvmTNMoHGNbIrYN+3Aj23IxgJkpds0doP3VstgmsNexhutZ9QrAms8T0zYzU5xXM46kcjsmvfvoeL2i
+        AeoUgA07T8yaaZuZKab1rzN74jgys1YB2O2gmBZzH49LODXrrJlnzEzxe9cOLH1ziMioVgCOiuIFX0CE
+        Q+/WYf+yieiCFrRp9tkwxnP7Kt5MbKGm6wfC000KwDlTXNLgEvHMkh+Db32o7fYivtQm1l9+3IBOp5P7
+        yjYPwlKNCsAluWudxgvtknb5t9oWcL/VLU2Mvd2JFq3uqs7vAtE/ceNayiMF4KiYMSjmY2O7B4Ua+NaD
+        YQGEJumRbvyG1IcfBHI12aAAXM8R57aIWTNrLLY4tfNPiCvpR1SeVeu6WWzHFD6THSDwFMDdpmUG62NJ
+        PKM4Or9ZxBxb8H8l7g5CEu8pAOfM3WanSeeS8CFHxW4zM2umbWamOCShXAH+/wNOANABIDUxWnDPAAAA
+        AElFTkSuQmCC
 </value>
   </data>
   <data name="btnOptions.Size" type="System.Drawing.Size, System.Drawing">

diff --git a/HaRepackerLib/Properties/Resources.Designer.cs b/HaRepackerLib/Properties/Resources.Designer.cs
diff --git a/HaRepackerLib/Properties/Resources.ja.resx b/HaRepackerLib/Properties/Resources.ja.resx
@@ -250,4 +250,7 @@
   <data name="SelectMp3" xml:space="preserve">
     <value>Select MP3 File</value>
   </data>
+  <data name="MainAdditionalInfo_PortalType" xml:space="preserve">
+    <value>ポータルタイプ：{0}</value>
+  </data>
 </root>
diff --git a/HaRepackerLib/Properties/Resources.ko.resx b/HaRepackerLib/Properties/Resources.ko.resx
@@ -250,4 +250,7 @@
   <data name="SelectMp3" xml:space="preserve">
     <value>Select MP3 File</value>
   </data>
+  <data name="MainAdditionalInfo_PortalType" xml:space="preserve">
+    <value>포털 유형 : {0}</value>
+  </data>
 </root>
diff --git a/HaRepackerLib/Properties/Resources.resx b/HaRepackerLib/Properties/Resources.resx
@@ -250,4 +250,7 @@
   <data name="SelectMp3" xml:space="preserve">
     <value>Select MP3 File</value>
   </data>
+  <data name="MainAdditionalInfo_PortalType" xml:space="preserve">
+    <value>Portal Type: {0}</value>
+  </data>
 </root>
diff --git a/HaRepackerLib/Properties/Resources.zh-CHS.resx b/HaRepackerLib/Properties/Resources.zh-CHS.resx
@@ -222,4 +222,7 @@
   <data name="SelectMp3" xml:space="preserve">
     <value>选择MP3文件</value>
   </data>
+  <data name="MainAdditionalInfo_PortalType" xml:space="preserve">
+    <value>门户类型：{0}</value>
+  </data>
 </root>
diff --git a/HaRepackerLib/Properties/Resources.zh-CHT.resx b/HaRepackerLib/Properties/Resources.zh-CHT.resx
@@ -213,4 +213,7 @@
   <data name="ImagesFilter" xml:space="preserve">
     <value>圖片 (*.jpg;*.bmp;*.png;*.gif;*.tiff)</value>
   </data>
+  <data name="MainAdditionalInfo_PortalType" xml:space="preserve">
+    <value>門戶類型：{0}</value>
+  </data>
 </root>