version 1.30

dunvit · Feb 4, 2017 · 9f7e2c4 · 9f7e2c4
1 parent 083f486
commit 9f7e2c4
Show file tree

Hide file tree

Showing 20 changed files with 1,538 additions and 1,315 deletions.
diff --git a/EvaJima/EveJima.csproj b/EvaJima/EveJima.csproj
@@ -58,7 +58,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\129\</OutputPath>
+    <OutputPath>bin\x86\130\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -137,10 +137,6 @@
       <Project>{6ed83e00-e836-4395-9fbc-7a3878455274}</Project>
       <Name>EveJimaSettings</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EveJimaBrowser\EveJimaBrowser.csproj">
-      <Project>{fc30a198-4213-404f-8526-d7be5d49e57d}</Project>
-      <Name>EveJimaBrowser</Name>
-    </ProjectReference>
     <ProjectReference Include="..\udater\updater.csproj">
       <Project>{7f0ef32c-6f14-4111-8c1d-64e0f34c9c23}</Project>
       <Name>updater</Name>

diff --git a/EvaJima/Version.txt b/EvaJima/Version.txt
@@ -1 +1 @@
-1.29
+1.30
diff --git a/EvaJimaCore/EveJimaCore.csproj b/EvaJimaCore/EveJimaCore.csproj
@@ -290,8 +290,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\minimize1.png" />
+    <None Include="Resources\minimize2.png" />
     <Content Include="teamdev.licenses" />
     <Content Include="Versions\1.27.txt" />
+    <Content Include="Versions\1.30.txt" />
     <Content Include="Versions\1.29.txt" />
     <Content Include="Versions\1.28.txt" />
   </ItemGroup>

diff --git a/EvaJimaCore/Properties/Resources.Designer.cs b/EvaJimaCore/Properties/Resources.Designer.cs
diff --git a/EvaJimaCore/Properties/Resources.resx b/EvaJimaCore/Properties/Resources.resx
@@ -145,6 +145,9 @@
   <data name="browser_execute" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\browser_execute.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="minimize1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\minimize1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -157,13 +160,16 @@
   <data name="minimize" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="bookmark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bookmark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="browser_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\browser_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="new-document-button" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\new-document-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bookmark" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bookmark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="minimize2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\minimize2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/EvaJimaCore/Resources/minimize1.png b/EvaJimaCore/Resources/minimize1.png
diff --git a/EvaJimaCore/Resources/minimize2.png b/EvaJimaCore/Resources/minimize2.png
diff --git a/EvaJimaCore/Versions/1.30.txt b/EvaJimaCore/Versions/1.30.txt
@@ -0,0 +1,31 @@
+EveJima version 1.30 https://github.com/dunvit/EveJima/releases
+
+----------------------------------------------------------------------------------------------------
+
+Список изменений в обновлении 1.30
+
+
+Дополнения и изменения:
+
++ Добавлена возможность максимизировать окно в режиме "Browser" убирая весь функционал программы кроме окна браузера
++ Добавлены ссылки на pasta.gg
++ Все кнопки на вкладках "Location" "Solar System" "Pilot" теперь открывают новые табы во встроенном браузере.
+
+Исправленные ошибки:
+
+
+----------------------------------------------------------------------------------------------------
+
+Patch notes for 1.30 Release 
+
+Features & Changes:
+
++ Added the ability to maximize the window in the mode of "Browser" removing the entire functionality of the program other than the browser window.
++ Added links to pasta.gg
++ All the buttons on the tabs "Location" "Solar System" "Pilot" is now open new tabs in the embedded browser.
+
+Defect Fixes:
+
+
+
+
diff --git a/EvaJimaCore/WhlControls/ucRichBrowser.cs b/EvaJimaCore/WhlControls/ucRichBrowser.cs
@@ -5,8 +5,11 @@
 
 namespace EveJimaCore.WhlControls
 {
+    public delegate void DelegateChangeBrowserMode(bool isMax);
+
     public partial class ucRichBrowser : UserControl
     {
+        public DelegateChangeBrowserMode ChangeViewMode;
 
         private static readonly ILog Log = LogManager.GetLogger(typeof(ucRichBrowser));
 
@@ -23,9 +26,12 @@ public ucRichBrowser()
             richBrowser.FormBorderStyle = FormBorderStyle.None;
             richBrowser.Visible = true;
             richBrowser.Dock = DockStyle.Fill;
+
+
             Controls.Add(richBrowser);
         }
 
+        public bool isMaxMode = false;
 
         public void BrowserUrlExecute(string url)
         {
@@ -41,14 +47,25 @@ public void BrowserUrlExecute(string url)
                 }
             }
 
-            richBrowser.Navigate(url);
+            richBrowser.OpenNewTab(url);
         }
 
         public void ResizeWebBrowser(int width, int height)
         {
-            Width = width - 24;
+            if (isMaxMode)
+            {
+                Width = width + 144;// - 24;
+
+                Height = height + 58;// - 110;
+            }
+            else
+            {
+                Width = width - 24;
+
+                Height = height - 110;  
+            }
 
-            Height = height - 110;
+
 
         }
 

diff --git a/EvaJimaCore/WhlControls/whlSolarSystem.Designer.cs b/EvaJimaCore/WhlControls/whlSolarSystem.Designer.cs
diff --git a/EvaJimaCore/WhlControls/whlSolarSystem.cs b/EvaJimaCore/WhlControls/whlSolarSystem.cs
@@ -154,5 +154,12 @@ private void Event_ShowTravelHistory(object sender, EventArgs e)
         {
             _showTravelHistory();
         }
+
+        private void Event_PastaShow(object sender, EventArgs e)
+        {
+            if (SolarSystem != null && SolarSystem.System != "unknown")
+                Global.InternalBrowser.Browser.BrowserUrlExecute("http://wh.pasta.gg/" + SolarSystem.System + "");
+
+        }
     }
 }
diff --git a/EvaJimaCore/WhlControls/whlSolarSystemOffline.Designer.cs b/EvaJimaCore/WhlControls/whlSolarSystemOffline.Designer.cs
diff --git a/EvaJimaCore/WhlControls/whlSolarSystemOffline.cs b/EvaJimaCore/WhlControls/whlSolarSystemOffline.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Windows.Forms;
 using EvaJimaCore;
 using EvaJimaCore.UiTools;
@@ -194,5 +193,12 @@ private void Event_ShowWormholePvE(object sender, EventArgs e)
         {
             Global.InternalBrowser.Browser.BrowserUrlExecute("https://docs.google.com/spreadsheets/d/17cNu8hxqJKqkkPnhDlIuJY-IT6ps7kTNCd3BEz0Bvqs/pubhtml#");
         }
+
+        private void Event_PastaShow(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(txtSolarSystem.Text)) return;
+
+            Global.InternalBrowser.Browser.BrowserUrlExecute("http://wh.pasta.gg/" + txtSolarSystem.Text.Trim() + "");
+        }
     }
 }