().FirstOrDefault(tab => tab.Name == name);
- }
- }
-
-
-}
diff --git a/Client/EvaJimaCore/Versions/2.02.txt b/Client/EvaJimaCore/Versions/202/2.02.txt
similarity index 67%
rename from Client/EvaJimaCore/Versions/2.02.txt
rename to Client/EvaJimaCore/Versions/202/2.02.txt
index 8513be2..6d5f7c4 100644
--- a/Client/EvaJimaCore/Versions/2.02.txt
+++ b/Client/EvaJimaCore/Versions/202/2.02.txt
@@ -6,17 +6,17 @@
Дополнения и изменения:
-+ Добавлены цвета соответствующие типу безопасности солнечной системы
-+ Вкладка "Solar System" переименована в "Information"
-+ Добавлена вкладка "Settings" с установками:
- * "Use Browser" включает использование браузера в прокрамме. По умолчанию включен.
- * "Use Wormholes Map" включает использование карты. В выключенном состоянии во вкладке "Location" информация предоставлена вминимальном режиме.
- * "Short signature rebuild" во включенном состоянии при копировании сигнатуры (crl-c при фокусе на сигнатуре в клиенте Eve) помещает в память текст в формате: Тип_сигнатуры Код_сигнатуры Название_сигнатуры
-+ Добавлена вкладка "Pathfinder" для проверки состояния систем в 5 прыжках от текущего местоположения пилота по сохраненным координатам.
+Добавлены цвета соответствующие типу безопасности солнечной системы
+Вкладка "Solar System" переименована в "Information"
+Добавлена вкладка "Settings" с установками:
+ "Use Browser" включает использование браузера в прокрамме. По умолчанию включен.
+ "Use Wormholes Map" включает использование карты. В выключенном состоянии во вкладке "Location" информация предоставлена вминимальном режиме.
+ "Short signature rebuild" во включенном состоянии при копировании сигнатуры (crl-c при фокусе на сигнатуре в клиенте Eve) помещает в память текст в формате: Тип_сигнатуры Код_сигнатуры Название_сигнатуры
+Добавлена вкладка "Pathfinder" для проверки состояния систем в 5 прыжках от текущего местоположения пилота по сохраненным координатам.
* Все сохраненные координаты (bookmarks) беруться из личных закладок пилота ("Persinal bookmarks" папка "[EveJima]"). Внимание. ССР кеширует данные на 3600 секунд, поэтому перед первым запуском перенесите все интересующие вас закладки в папку [EveJima]
* По координатам находящимся в радиусе 5 прыжков предоставляется информация о числе пилотов, уничтоженных НПС кораблей и кораблей капсулеров за последний час.
* При двойном клике на координаты в EveJima устанавливается автопилот в клиенте Eve Online.
-+ Удалена вкладка "Pilots"
+Удалена вкладка "Pilots"
Исправленные ошибки:
diff --git a/Client/EvaJimaCore/Versions/202/Release.html b/Client/EvaJimaCore/Versions/202/Release.html
new file mode 100644
index 0000000..ab67e8d
--- /dev/null
+++ b/Client/EvaJimaCore/Versions/202/Release.html
@@ -0,0 +1,98 @@
+
+
+
+
+
+ EveJima documentation
+
+
+
+ Version 2.02
+Список изменений в обновлении 2.02
+
+Важная информация: С версией 2.02 не работает встроенная система обнавления версий. Программу необходимо установить с помощью установщика (EveJimaInstaller.msi)
+
+
Дополнения и изменения:
+
+ - Добавлены цвета соответствующие типу безопасности солнечной системы.
+ - Вкладка "Solar System" переименована в "Information"
+ -
+ Добавлена вкладка "Settings" с установками:
+
+ - "Use Browser" включает использование браузера в прокрамме. По умолчанию включен.
+ - "Use Wormholes Map" включает использование карты. В выключенном состоянии во вкладке "Location" информация предоставлена вминимальном режиме.
+ - "Short signature rebuild" во включенном состоянии при копировании сигнатуры (crl-c при фокусе на сигнатуре в клиенте Eve) помещает в память текст в формате: Тип_сигнатуры Код_сигнатуры Название_сигнатуры
+
+
+ -
+ Добавлена вкладка "Pathfinder" для проверки состояния систем в 5 прыжках от текущего местоположения пилота по сохраненным координатам.
+
+ - Все сохраненные координаты (bookmarks) беруться из личных закладок пилота ("Persinal bookmarks" папка "[EveJima]"). Внимание. ССР кеширует данные на 3600 секунд, поэтому перед первым запуском перенесите все интересующие вас закладки в папку [EveJima]
+ - По координатам находящимся в радиусе 5 прыжков предоставляется информация о числе пилотов, уничтоженных НПС кораблей и кораблей капсулеров за последний час.
+ - При двойном клике на координаты в EveJima устанавливается автопилот в клиенте Eve Online.
+
+
+ - Удалена вкладка "Pilots"
+
+ Исправленные ошибки:
+
+ - Теперь иконка EvaJima успешно выгружается из списка "hidden icons" после закрытия программы.
+ - Исправлены вылеты программы при чтении csv файлов
+ - Исправлены вылеты программы при переключении между вкладками
+
+
+ Patch notes for 2.02 Release
+ Features & Changes:
+
+ - Added colors to solar system info by security status+ Rename tab from "Solar System" to "Information"
+ -
+ Added new tab "Settings":
+
+ - "Use Browser" Add/remove the browser from an application. By default is enabled.
+ - "Use Wormholes Map" Add/remove map in tab "Location". In unselected mode get only basic location information.
+ - "Short signature rebuild" in enabked mode after ctrl-C in signature rebuild text to format: Signature_type Signature_code Signature_name
+
+
+ -
+ Added new tab "Pathfinder" for check solar system in range 5 jumps from a pilot location.
+
+ - All bookmarks getting from ("Personal bookmarks" folder "[EveJima]"). Attention. This route is cached by CCP for up to 3600 seconds. Before start program copy bookmarks in Eve Online to folder [EveJima]
+ - By bookmarks EveJima gets the number of ships, pod and NPC kills per solar system within the last hour.
+ - By double click on bookmarks in EveJima set autopilot in Eve Online.
+
+
+ - Removed tab "Pilots"
+
+
Defect Fixes:
+
+ - Now icon EveJima success removed from hidden icons after terminating program.
+ - Fixed crashes in read csv files
+ - Fixed crashes when switching between tabs
+
+
+
+
+
+
+ Добавлены цвета соответствующие типу безопасности солнечной системы.
+
+ 
+
+
+
+
+ Добавлена вкладка "Settings" с установками
+
+ 
+
+
+
+
+ Добавлена вкладка "Pathfinder" для проверки bookmarks в близлежащих системах.
+
+ 
+
+
+
+
+
\ No newline at end of file
diff --git a/Client/EvaJimaCore/Versions/Tasks.txt b/Client/EvaJimaCore/Versions/Tasks.txt
index 350e0b3..79f9d38 100644
--- a/Client/EvaJimaCore/Versions/Tasks.txt
+++ b/Client/EvaJimaCore/Versions/Tasks.txt
@@ -12,24 +12,3 @@ Before release:
- Disable click event in inactive button "Location"
-
-
-
-
-
-Migration files:
-
-EveJima.exe
-EveJima.exe.config
-EveJima.vshost.exe
-EveJima.vshost.exe.config
-EveJima.vshost.exe.manifest
-EveJimaCore.dll
-EveJimaEnvironment.txt
-EveJimaServerMap.dll
-EveJimaSettings.dll
-EveJimaSettings.txt
-EveJimaUniverse.dll
-settings.txt
-Version.txt
-WBrowser.exe
diff --git a/Client/EvaJimaCore/WhlControls/eveCrlPathfinder.Designer.cs b/Client/EvaJimaCore/WhlControls/eveCrlPathfinder.Designer.cs
index dbf4206..3d44b71 100644
--- a/Client/EvaJimaCore/WhlControls/eveCrlPathfinder.Designer.cs
+++ b/Client/EvaJimaCore/WhlControls/eveCrlPathfinder.Designer.cs
@@ -103,7 +103,6 @@ private void InitializeComponent()
this.dataGridView1.Size = new System.Drawing.Size(516, 174);
this.dataGridView1.TabIndex = 148;
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
- this.dataGridView1.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dataGridView1_CellPainting);
//
// label4
//
diff --git a/Client/EvaJimaCore/WhlControls/eveCrlPathfinder.cs b/Client/EvaJimaCore/WhlControls/eveCrlPathfinder.cs
index cd92f8a..9391c7b 100644
--- a/Client/EvaJimaCore/WhlControls/eveCrlPathfinder.cs
+++ b/Client/EvaJimaCore/WhlControls/eveCrlPathfinder.cs
@@ -15,7 +15,7 @@ public partial class EveCrlPathfinder : UserControl
{
private static readonly ILog Log = LogManager.GetLogger("All");
private string _location;
- private BindingSource gridDataSource = new BindingSource();
+ private BindingSource _gridDataSource = new BindingSource();
public EveCrlPathfinder()
{
@@ -32,13 +32,13 @@ public EveCrlPathfinder()
private void FillBookmarksContainer(IEnumerable pathes)
{
- gridDataSource = new BindingSource();
+ _gridDataSource = new BindingSource();
if(pathes != null)
{
foreach (var path in pathes.OrderBy(data => data.Jumps))
{
- gridDataSource.Add(new Path
+ _gridDataSource.Add(new Path
{
SystemName = path.SystemName,
Name = path.Name,
@@ -55,73 +55,79 @@ private void FillBookmarksContainer(IEnumerable pathes)
dataGridView1.Columns.Clear();
- DataGridViewColumn Jumps = new DataGridViewTextBoxColumn();
- Jumps.Width = 60;
- Jumps.DataPropertyName = "Jumps";
- Jumps.Name = "Jumps";
- Jumps.DefaultCellStyle.BackColor = Color.Black;
- dataGridView1.Columns.Add(Jumps);
+ DataGridViewColumn jumps = new DataGridViewTextBoxColumn
+ {
+ Width = 60,
+ DataPropertyName = "Jumps",
+ Name = "Jumps"
+ };
+ jumps.DefaultCellStyle.BackColor = Color.Black;
+ dataGridView1.Columns.Add(jumps);
- DataGridViewColumn code = new DataGridViewTextBoxColumn();
- code.Width = 120;
- code.DataPropertyName = "SystemName";
- code.Name = "System";
+ DataGridViewColumn code = new DataGridViewTextBoxColumn
+ {
+ Width = 120,
+ DataPropertyName = "SystemName",
+ Name = "System"
+ };
code.DefaultCellStyle.BackColor = Color.Black;
dataGridView1.Columns.Add(code);
- DataGridViewColumn column = new DataGridViewTextBoxColumn();
- column.Width = 280;
- column.DataPropertyName = "Name";
- column.Name = "Name";
+ DataGridViewColumn column = new DataGridViewTextBoxColumn
+ {
+ Width = 280,
+ DataPropertyName = "Name",
+ Name = "Name"
+ };
column.DefaultCellStyle.BackColor = Color.Black;
dataGridView1.Columns.Add(column);
- DataGridViewColumn Note = new DataGridViewTextBoxColumn();
- Note.Width = 240;
- Note.DataPropertyName = "Note";
- Note.Name = "Note";
- Note.DefaultCellStyle.BackColor = Color.Black;
- dataGridView1.Columns.Add(Note);
-
-
-
- DataGridViewColumn Pilotes = new DataGridViewTextBoxColumn();
- Pilotes.Width = 50;
- Pilotes.DataPropertyName = "Pilotes";
- Pilotes.Name = "Pilotes";
- Pilotes.DefaultCellStyle.BackColor = Color.Black;
- dataGridView1.Columns.Add(Pilotes);
-
- DataGridViewColumn ShipKills = new DataGridViewTextBoxColumn();
- ShipKills.Width = 50;
- ShipKills.DataPropertyName = "ShipKills";
- ShipKills.Name = "Ship";
- ShipKills.DefaultCellStyle.BackColor = Color.Black;
- dataGridView1.Columns.Add(ShipKills);
+ DataGridViewColumn note = new DataGridViewTextBoxColumn
+ {
+ Width = 240,
+ DataPropertyName = "Note",
+ Name = "Note"
+ };
+ note.DefaultCellStyle.BackColor = Color.Black;
+ dataGridView1.Columns.Add(note);
- DataGridViewColumn NpcKills = new DataGridViewTextBoxColumn();
- NpcKills.Width = 50;
- NpcKills.DataPropertyName = "NpcKills";
- NpcKills.Name = "Npc";
- NpcKills.DefaultCellStyle.BackColor = Color.Black;
- dataGridView1.Columns.Add(NpcKills);
+ DataGridViewColumn pilots = new DataGridViewTextBoxColumn
+ {
+ Width = 50,
+ DataPropertyName = "Pilotes",
+ Name = "Pilotes"
+ };
+ pilots.DefaultCellStyle.BackColor = Color.Black;
+ dataGridView1.Columns.Add(pilots);
+
+ DataGridViewColumn shipsKills = new DataGridViewTextBoxColumn
+ {
+ Width = 50,
+ DataPropertyName = "ShipKills",
+ Name = "Ships"
+ };
+ shipsKills.DefaultCellStyle.BackColor = Color.Black;
+ dataGridView1.Columns.Add(shipsKills);
+
+ DataGridViewColumn npcKills = new DataGridViewTextBoxColumn
+ {
+ Width = 50,
+ DataPropertyName = "NpcKills",
+ Name = "Npc"
+ };
+ npcKills.DefaultCellStyle.BackColor = Color.Black;
+ dataGridView1.Columns.Add(npcKills);
dataGridView1.AutoGenerateColumns = false;
- dataGridView1.DataSource = gridDataSource;
-
+ dataGridView1.DataSource = _gridDataSource;
dataGridView1.ClearSelection();
}
- void dataGridView1_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
- {
-
- }
-
private IEnumerable GetPathes(string location, Universe universe, PilotEntity pilot)
{
try
@@ -145,7 +151,6 @@ private IEnumerable GetPathes(string location, Universe universe, PilotEnt
return null;
}
-
}
private void Event_RefreshBookmarks(object sender, EventArgs e)
diff --git a/Client/EvaJimaCore/WhlControls/ucRichBrowser.cs b/Client/EvaJimaCore/WhlControls/ucRichBrowser.cs
index 826fb02..a2a5eda 100644
--- a/Client/EvaJimaCore/WhlControls/ucRichBrowser.cs
+++ b/Client/EvaJimaCore/WhlControls/ucRichBrowser.cs
@@ -59,7 +59,7 @@ private void Event_BrowserAfterBeforeShowDialog()
private void Event_ShowFavoritesChange(bool isShowFavorites)
{
Global.WorkEnvironment.IsShowFavorites = isShowFavorites;
- Global.WorkEnvironment.SaveChanges();
+ Global.ApplicationSettings.Save();
}
public bool isMaxMode = false;
diff --git a/Client/EvaJimaCore/WhlControls/whlAuthorization.Designer.cs b/Client/EvaJimaCore/WhlControls/whlAuthorization.Designer.cs
index a43ac90..25c8c95 100644
--- a/Client/EvaJimaCore/WhlControls/whlAuthorization.Designer.cs
+++ b/Client/EvaJimaCore/WhlControls/whlAuthorization.Designer.cs
@@ -50,7 +50,6 @@ private void InitializeComponent()
this.cmbPilots.Size = new System.Drawing.Size(157, 21);
this.cmbPilots.TabIndex = 14;
this.cmbPilots.Visible = false;
- this.cmbPilots.SelectedIndexChanged += new System.EventHandler(this.cmbPilots_SelectedIndexChanged);
this.cmbPilots.TextChanged += new System.EventHandler(this.cmbPilots_TextChanged);
//
// crlPilotPortrait
diff --git a/Client/EvaJimaCore/WhlControls/whlAuthorization.cs b/Client/EvaJimaCore/WhlControls/whlAuthorization.cs
index 6a41cb8..37d023a 100644
--- a/Client/EvaJimaCore/WhlControls/whlAuthorization.cs
+++ b/Client/EvaJimaCore/WhlControls/whlAuthorization.cs
@@ -99,7 +99,7 @@ public void AuthorizeAllPilotsInAccount(string obj)
private void Event_GoToCCPSSO(object sender, EventArgs e)
{
- var data = WebUtility.UrlEncode(@"http://localhost:" + Global.Settings.CCPSSO_AUTH_PORT + "/WormholeLocator");
+ var data = WebUtility.UrlEncode(@"http://localhost:" + Global.ApplicationSettings.Authorization_Port + "/WormholeLocator");
var address = "https://login.eveonline.com/oauth/authorize?response_type=code&redirect_uri=" + data +
"&client_id=" + Global.ApplicationSettings.Authorization_ClientId +
@@ -252,7 +252,6 @@ private void ShowPilots()
}
}
-
private void cmbPilots_TextChanged(object sender, EventArgs e)
{
if (_isLoadedPilotesFromStorage)
@@ -266,30 +265,7 @@ private void cmbPilots_TextChanged(object sender, EventArgs e)
public void RefreshAuthorizationStatus()
{
- if (Global.Settings.IsAuthorizationEnabled)
- {
- lblAuthorizationInfo.Text = TextAuthorizationInfo;
- }
- else
- {
- lblAuthorizationInfo.Text = TextErrorAuthorizationInfo;
- btnLogInWithEveOnline.Visible = false;
- }
-
- //string[] allLines = Global.Pilots.GetPilotsStorageContent();
-
- //if (allLines.Count() > 0)
- //{
- // lblAuthorizationInfo.Text = TextPleaseWaitLoadingPilots + Environment.NewLine + Environment.NewLine;
- // btnLogInWithEveOnline.Visible = false;
- //}
-
-
- }
-
- private void cmbPilots_SelectedIndexChanged(object sender, EventArgs e)
- {
-
+ lblAuthorizationInfo.Text = TextAuthorizationInfo;
}
private void cmdLoadPilotes_Click(object sender, EventArgs e)
diff --git a/Client/EvaJimaCore/WhlControls/whlVersion.cs b/Client/EvaJimaCore/WhlControls/whlVersion.cs
index c882354..d36c2b5 100644
--- a/Client/EvaJimaCore/WhlControls/whlVersion.cs
+++ b/Client/EvaJimaCore/WhlControls/whlVersion.cs
@@ -1,9 +1,8 @@
using System;
using System.Diagnostics;
-using System.IO;
+using System.Net;
using System.Windows.Forms;
using EvaJimaCore;
-using CefSharp.WinForms;
using log4net;
namespace EveJimaCore.WhlControls
@@ -12,12 +11,13 @@ public partial class whlVersion : BaseContainer
{
private static readonly ILog Log = LogManager.GetLogger(typeof(whlVersion));
-
public whlVersion()
{
InitializeComponent();
- AddTab("https://github.com/dunvit/EveJima/releases");
+ var address = @"http://evejima.mikotaj.com/versions/Release_" + Global.ApplicationSettings.Version + @".html";
+
+ AddTab(address);
Activate();
}
@@ -26,11 +26,10 @@ private void Activate()
{
try
{
- cmdPasteCosmicSifnatures.Value = @"Update from version " + Global.Settings.CurrentVersion.Trim() + " to " + Global.Settings.Version;
+ cmdPasteCosmicSifnatures.Value = @"Update from version " + Global.ApplicationSettings.CurrentVersion + " to " + Global.ApplicationSettings.Version;
cmdPasteCosmicSifnatures.Refresh();
cmdPasteCosmicSifnatures.Visible = true;
-
}
catch (Exception ex)
{
@@ -44,21 +43,19 @@ private void AddTab(string url)
{
browserTabControl.SuspendLayout();
- var browser = new WebBrowser();
-
- // Add it to the form and fill it to the form window.
- browser.Dock = DockStyle.Fill;
+ var browser = new WebBrowser { Dock = DockStyle.Fill };
var tabPage = new TabPage(url)
{
Dock = DockStyle.Fill
};
- //This call isn't required for the sample to work.
- //It's sole purpose is to demonstrate that #553 has been resolved.
- // browser.CreateControl();
+ //browser.Navigate(url);
+
+ var serviceRequest = new WebClient();
+ var response = serviceRequest.DownloadString(new Uri(url));
- browser.Navigate(url);
+ browser.DocumentText = response;
browser.Tag = tabPage;
@@ -82,29 +79,23 @@ public void DisposeBrowser()
{
Log.ErrorFormat("[whlVersion.DisposeBrowser] Critical error. Exception {0}", ex);
}
-
}
-
private void Event_StartUpdateVersion(object sender, EventArgs e)
{
try
{
Log.Debug("[whlVersion.Event_StartUpdateVersion] Start update");
- //string text = File.ReadAllText("settings.txt");
- //text = text.Replace("VersionContent.txt", "VersionContent_" + Global.Settings.CurrentVersion.Replace(".","") + ".txt");
- //File.WriteAllText("settings.txt", text);
-
- Global.ApplicationSettings.Server_update_content_version = Global.ApplicationSettings.Server_update_uri_version.Replace("Version.txt", "" + Global.Settings.CurrentVersion + "/VersionContent.txt");
- Global.ApplicationSettings.Save();
+ //Global.ApplicationSettings.Server_update_content_version = Global.ApplicationSettings.Server_update_uri_version.Replace("Version.txt", "" + Global.Settings.CurrentVersion + "/VersionContent.txt");
+ //Global.ApplicationSettings.Save();
try
{
try
{
- //Process.Start("https://github.com/dunvit/EveJima/releases/tag/" + Global.Settings.CurrentVersion);
- Process.Start(@"updater.exe");
+ Process.Start("https://github.com/dunvit/EvaJima/releases/tag/" + Global.ApplicationSettings.Version);
+ //Process.Start(@"updater.exe");
}
catch (Exception ex2)
{
@@ -116,14 +107,14 @@ private void Event_StartUpdateVersion(object sender, EventArgs e)
Log.ErrorFormat("[whlVersion.Event_StartUpdateVersion] Critical error. Exception {0}", ex1);
}
+ Global.Presenter.Close();
+
Application.Exit();
}
catch (Exception ex)
{
Log.ErrorFormat("[whlVersion.Event_StartUpdateVersion] Critical error. Exception {0}", ex);
}
-
-
}
}
}
diff --git a/Client/EvaJimaCore/WindowMonitoring.Designer.cs b/Client/EvaJimaCore/WindowMonitoring.Designer.cs
deleted file mode 100644
index 72f6583..0000000
--- a/Client/EvaJimaCore/WindowMonitoring.Designer.cs
+++ /dev/null
@@ -1,479 +0,0 @@
-namespace EveJimaCore
-{
- partial class WindowMonitoring
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WindowMonitoring));
- this.pnlContainer = new System.Windows.Forms.Panel();
- this.label18 = new System.Windows.Forms.Label();
- this.label19 = new System.Windows.Forms.Label();
- this.label20 = new System.Windows.Forms.Label();
- this.lblVersionID = new System.Windows.Forms.Label();
- this.TitleBar = new System.Windows.Forms.Panel();
- this.cmdHide = new System.Windows.Forms.Button();
- this.btnBrowserMin = new System.Windows.Forms.Button();
- this.btnBrowserMax = new System.Windows.Forms.Button();
- this.cmdPin = new System.Windows.Forms.Button();
- this.btnOpenBrowserAndStartUrl = new System.Windows.Forms.Button();
- this.cmdClose = new System.Windows.Forms.Button();
- this.cmdMinimazeRestore = new System.Windows.Forms.Button();
- this.VersionBar = new System.Windows.Forms.Panel();
- this.label1 = new System.Windows.Forms.Label();
- this.crlNotificay = new System.Windows.Forms.NotifyIcon(this.components);
- this.RefreshActivePilot = new System.Windows.Forms.Timer(this.components);
- this.cmdVersion1 = new EveJimaCore.WhlControls.ejButton();
- this._mapToolbarControl1 = new EveJimaCore.Logic.ToolBar.MapToolbarControl();
- this.cmdOpenWebBrowser1 = new EveJimaCore.WhlControls.ejButton();
- this.cmdShowContainerBookmarks1 = new EveJimaCore.WhlControls.ejButton();
- this.cmdShowContainerPilots1 = new EveJimaCore.WhlControls.ejButton();
- this.cmdShowContainerSolarSystem1 = new EveJimaCore.WhlControls.ejButton();
- this.cmdMap = new EveJimaCore.WhlControls.ejButton();
- this.cmdAuthirizationPanel1 = new EveJimaCore.WhlControls.ejButton();
- this.TitleBar.SuspendLayout();
- this.VersionBar.SuspendLayout();
- this.SuspendLayout();
- //
- // pnlContainer
- //
- this.pnlContainer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.pnlContainer.Location = new System.Drawing.Point(4, 57);
- this.pnlContainer.Name = "pnlContainer";
- this.pnlContainer.Size = new System.Drawing.Size(548, 261);
- this.pnlContainer.TabIndex = 8;
- //
- // label18
- //
- this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label18.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label18.ForeColor = System.Drawing.Color.DarkGray;
- this.label18.Location = new System.Drawing.Point(276, 0);
- this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(100, 23);
- this.label18.TabIndex = 42;
- this.label18.Text = "Created by";
- this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // label19
- //
- this.label19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.label19.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label19.ForeColor = System.Drawing.Color.DarkOrange;
- this.label19.Location = new System.Drawing.Point(382, 0);
- this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(157, 23);
- this.label19.TabIndex = 43;
- this.label19.Text = "Dunkan Su-Shiloff";
- this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // label20
- //
- this.label20.AutoSize = true;
- this.label20.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label20.ForeColor = System.Drawing.Color.DarkGray;
- this.label20.Location = new System.Drawing.Point(82, 4);
- this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(60, 16);
- this.label20.TabIndex = 44;
- this.label20.Text = "version ";
- this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
- // lblVersionID
- //
- this.lblVersionID.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblVersionID.ForeColor = System.Drawing.Color.Olive;
- this.lblVersionID.Location = new System.Drawing.Point(137, 1);
- this.lblVersionID.Name = "lblVersionID";
- this.lblVersionID.Size = new System.Drawing.Size(77, 23);
- this.lblVersionID.TabIndex = 45;
- this.lblVersionID.Text = "1.12";
- this.lblVersionID.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // TitleBar
- //
- this.TitleBar.BackColor = System.Drawing.Color.Black;
- this.TitleBar.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.TitleBar.Controls.Add(this.cmdHide);
- this.TitleBar.Controls.Add(this.btnBrowserMin);
- this.TitleBar.Controls.Add(this.btnBrowserMax);
- this.TitleBar.Controls.Add(this.cmdPin);
- this.TitleBar.Controls.Add(this.btnOpenBrowserAndStartUrl);
- this.TitleBar.Controls.Add(this.cmdClose);
- this.TitleBar.Controls.Add(this.cmdMinimazeRestore);
- this.TitleBar.Location = new System.Drawing.Point(0, 0);
- this.TitleBar.Name = "TitleBar";
- this.TitleBar.Size = new System.Drawing.Size(795, 28);
- this.TitleBar.TabIndex = 47;
- this.TitleBar.DoubleClick += new System.EventHandler(this.Event_TitleBarDoubleClick);
- this.TitleBar.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Event_TitleBarMouseDown);
- //
- // cmdHide
- //
- this.cmdHide.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.cmdHide.BackColor = System.Drawing.Color.Black;
- this.cmdHide.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdHide.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdHide.Image = global::EveJimaCore.Properties.Resources.hide;
- this.cmdHide.Location = new System.Drawing.Point(727, 1);
- this.cmdHide.Name = "cmdHide";
- this.cmdHide.Size = new System.Drawing.Size(22, 22);
- this.cmdHide.TabIndex = 49;
- this.cmdHide.UseVisualStyleBackColor = false;
- this.cmdHide.Click += new System.EventHandler(this.Event_Hide);
- //
- // btnBrowserMin
- //
- this.btnBrowserMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnBrowserMin.BackColor = System.Drawing.Color.Black;
- this.btnBrowserMin.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnBrowserMin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnBrowserMin.Image = global::EveJimaCore.Properties.Resources.minimize2;
- this.btnBrowserMin.Location = new System.Drawing.Point(383, 2);
- this.btnBrowserMin.Name = "btnBrowserMin";
- this.btnBrowserMin.Size = new System.Drawing.Size(22, 22);
- this.btnBrowserMin.TabIndex = 48;
- this.btnBrowserMin.UseVisualStyleBackColor = false;
- this.btnBrowserMin.Visible = false;
- this.btnBrowserMin.Click += new System.EventHandler(this.btnBrowserMin_Click);
- //
- // btnBrowserMax
- //
- this.btnBrowserMax.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnBrowserMax.BackColor = System.Drawing.Color.Black;
- this.btnBrowserMax.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnBrowserMax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnBrowserMax.Image = global::EveJimaCore.Properties.Resources.minimize1;
- this.btnBrowserMax.Location = new System.Drawing.Point(409, 2);
- this.btnBrowserMax.Name = "btnBrowserMax";
- this.btnBrowserMax.Size = new System.Drawing.Size(22, 22);
- this.btnBrowserMax.TabIndex = 47;
- this.btnBrowserMax.UseVisualStyleBackColor = false;
- this.btnBrowserMax.Visible = false;
- this.btnBrowserMax.Click += new System.EventHandler(this.btnBrowserMax_Click);
- //
- // cmdPin
- //
- this.cmdPin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.cmdPin.BackColor = System.Drawing.Color.Black;
- this.cmdPin.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdPin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdPin.Image = global::EveJimaCore.Properties.Resources.pin;
- this.cmdPin.Location = new System.Drawing.Point(685, 1);
- this.cmdPin.Name = "cmdPin";
- this.cmdPin.Size = new System.Drawing.Size(22, 22);
- this.cmdPin.TabIndex = 3;
- this.cmdPin.UseVisualStyleBackColor = false;
- this.cmdPin.Click += new System.EventHandler(this.cmdPin_Click);
- //
- // btnOpenBrowserAndStartUrl
- //
- this.btnOpenBrowserAndStartUrl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnOpenBrowserAndStartUrl.BackColor = System.Drawing.Color.Black;
- this.btnOpenBrowserAndStartUrl.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnOpenBrowserAndStartUrl.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnOpenBrowserAndStartUrl.Image = global::EveJimaCore.Properties.Resources.url;
- this.btnOpenBrowserAndStartUrl.Location = new System.Drawing.Point(707, 1);
- this.btnOpenBrowserAndStartUrl.Name = "btnOpenBrowserAndStartUrl";
- this.btnOpenBrowserAndStartUrl.Size = new System.Drawing.Size(22, 22);
- this.btnOpenBrowserAndStartUrl.TabIndex = 46;
- this.btnOpenBrowserAndStartUrl.UseVisualStyleBackColor = false;
- this.btnOpenBrowserAndStartUrl.Click += new System.EventHandler(this.Event_OpenBrowserContainer);
- //
- // cmdClose
- //
- this.cmdClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.cmdClose.BackColor = System.Drawing.Color.Black;
- this.cmdClose.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdClose.Image = global::EveJimaCore.Properties.Resources.close;
- this.cmdClose.Location = new System.Drawing.Point(767, 1);
- this.cmdClose.Name = "cmdClose";
- this.cmdClose.Size = new System.Drawing.Size(22, 22);
- this.cmdClose.TabIndex = 0;
- this.cmdClose.UseVisualStyleBackColor = false;
- this.cmdClose.Click += new System.EventHandler(this.cmdClose_Click);
- //
- // cmdMinimazeRestore
- //
- this.cmdMinimazeRestore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.cmdMinimazeRestore.BackColor = System.Drawing.Color.Black;
- this.cmdMinimazeRestore.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdMinimazeRestore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdMinimazeRestore.Image = global::EveJimaCore.Properties.Resources.minimize;
- this.cmdMinimazeRestore.Location = new System.Drawing.Point(747, 1);
- this.cmdMinimazeRestore.Name = "cmdMinimazeRestore";
- this.cmdMinimazeRestore.Size = new System.Drawing.Size(22, 22);
- this.cmdMinimazeRestore.TabIndex = 2;
- this.cmdMinimazeRestore.UseVisualStyleBackColor = false;
- this.cmdMinimazeRestore.Click += new System.EventHandler(this.cmdMinimazeRestore_Click);
- //
- // VersionBar
- //
- this.VersionBar.BackColor = System.Drawing.Color.Transparent;
- this.VersionBar.Controls.Add(this.label1);
- this.VersionBar.Controls.Add(this.label18);
- this.VersionBar.Controls.Add(this.label19);
- this.VersionBar.Controls.Add(this.label20);
- this.VersionBar.Controls.Add(this.lblVersionID);
- this.VersionBar.Location = new System.Drawing.Point(10, 330);
- this.VersionBar.Name = "VersionBar";
- this.VersionBar.Size = new System.Drawing.Size(540, 28);
- this.VersionBar.TabIndex = 48;
- //
- // label1
- //
- this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.ForeColor = System.Drawing.Color.DarkOrange;
- this.label1.Location = new System.Drawing.Point(8, 3);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(71, 17);
- this.label1.TabIndex = 46;
- this.label1.Text = "EveJima";
- this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // crlNotificay
- //
- this.crlNotificay.Icon = ((System.Drawing.Icon)(resources.GetObject("crlNotificay.Icon")));
- this.crlNotificay.Text = "Eve JIma";
- this.crlNotificay.Visible = true;
- this.crlNotificay.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.crlNotificay_MouseDoubleClick);
- //
- // RefreshActivePilot
- //
- this.RefreshActivePilot.Enabled = true;
- this.RefreshActivePilot.Interval = 1000;
- this.RefreshActivePilot.Tick += new System.EventHandler(this.Event_RefreshActivePilot);
- //
- // cmdVersion1
- //
- this.cmdVersion1.AutoSize = true;
- this.cmdVersion1.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdVersion1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdVersion1.FlatAppearance.BorderSize = 0;
- this.cmdVersion1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdVersion1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdVersion1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdVersion1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cmdVersion1.ForeColor = System.Drawing.Color.Silver;
- this.cmdVersion1.Location = new System.Drawing.Point(10, 408);
- this.cmdVersion1.Name = "cmdVersion1";
- this.cmdVersion1.Size = new System.Drawing.Size(63, 23);
- this.cmdVersion1.TabIndex = 72;
- this.cmdVersion1.Text = "Version";
- this.cmdVersion1.UseVisualStyleBackColor = true;
- this.cmdVersion1.Visible = false;
- //
- // _mapToolbarControl1
- //
- this._mapToolbarControl1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(14)))), ((int)(((byte)(14)))));
- this._mapToolbarControl1.Location = new System.Drawing.Point(95, 592);
- this._mapToolbarControl1.Name = "_mapToolbarControl1";
- this._mapToolbarControl1.SelectedTab = "Authorization";
- this._mapToolbarControl1.Size = new System.Drawing.Size(448, 32);
- this._mapToolbarControl1.TabIndex = 71;
- this._mapToolbarControl1.Visible = false;
- //
- // cmdOpenWebBrowser1
- //
- this.cmdOpenWebBrowser1.AutoSize = true;
- this.cmdOpenWebBrowser1.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdOpenWebBrowser1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdOpenWebBrowser1.FlatAppearance.BorderSize = 0;
- this.cmdOpenWebBrowser1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdOpenWebBrowser1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdOpenWebBrowser1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdOpenWebBrowser1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cmdOpenWebBrowser1.ForeColor = System.Drawing.Color.Silver;
- this.cmdOpenWebBrowser1.Location = new System.Drawing.Point(363, 31);
- this.cmdOpenWebBrowser1.Name = "cmdOpenWebBrowser1";
- this.cmdOpenWebBrowser1.Size = new System.Drawing.Size(91, 23);
- this.cmdOpenWebBrowser1.TabIndex = 70;
- this.cmdOpenWebBrowser1.Text = "Web Browser";
- this.cmdOpenWebBrowser1.UseVisualStyleBackColor = true;
- //
- // cmdShowContainerBookmarks1
- //
- this.cmdShowContainerBookmarks1.AutoSize = true;
- this.cmdShowContainerBookmarks1.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdShowContainerBookmarks1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerBookmarks1.FlatAppearance.BorderSize = 0;
- this.cmdShowContainerBookmarks1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerBookmarks1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerBookmarks1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdShowContainerBookmarks1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cmdShowContainerBookmarks1.ForeColor = System.Drawing.Color.Silver;
- this.cmdShowContainerBookmarks1.Location = new System.Drawing.Point(289, 31);
- this.cmdShowContainerBookmarks1.Name = "cmdShowContainerBookmarks1";
- this.cmdShowContainerBookmarks1.Size = new System.Drawing.Size(81, 23);
- this.cmdShowContainerBookmarks1.TabIndex = 69;
- this.cmdShowContainerBookmarks1.Text = "Bookmarks";
- this.cmdShowContainerBookmarks1.UseVisualStyleBackColor = true;
- //
- // cmdShowContainerPilots1
- //
- this.cmdShowContainerPilots1.AutoSize = true;
- this.cmdShowContainerPilots1.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdShowContainerPilots1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerPilots1.FlatAppearance.BorderSize = 0;
- this.cmdShowContainerPilots1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerPilots1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerPilots1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdShowContainerPilots1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cmdShowContainerPilots1.ForeColor = System.Drawing.Color.Silver;
- this.cmdShowContainerPilots1.Location = new System.Drawing.Point(245, 31);
- this.cmdShowContainerPilots1.Name = "cmdShowContainerPilots1";
- this.cmdShowContainerPilots1.Size = new System.Drawing.Size(48, 23);
- this.cmdShowContainerPilots1.TabIndex = 68;
- this.cmdShowContainerPilots1.Text = "Pilots";
- this.cmdShowContainerPilots1.UseVisualStyleBackColor = true;
- //
- // cmdShowContainerSolarSystem1
- //
- this.cmdShowContainerSolarSystem1.AutoSize = true;
- this.cmdShowContainerSolarSystem1.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdShowContainerSolarSystem1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerSolarSystem1.FlatAppearance.BorderSize = 0;
- this.cmdShowContainerSolarSystem1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerSolarSystem1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdShowContainerSolarSystem1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdShowContainerSolarSystem1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cmdShowContainerSolarSystem1.ForeColor = System.Drawing.Color.Silver;
- this.cmdShowContainerSolarSystem1.Location = new System.Drawing.Point(159, 31);
- this.cmdShowContainerSolarSystem1.Name = "cmdShowContainerSolarSystem1";
- this.cmdShowContainerSolarSystem1.Size = new System.Drawing.Size(92, 23);
- this.cmdShowContainerSolarSystem1.TabIndex = 67;
- this.cmdShowContainerSolarSystem1.Text = "Solar System";
- this.cmdShowContainerSolarSystem1.UseVisualStyleBackColor = true;
- //
- // cmdMap
- //
- this.cmdMap.AutoSize = true;
- this.cmdMap.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdMap.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdMap.FlatAppearance.BorderSize = 0;
- this.cmdMap.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdMap.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdMap.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdMap.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cmdMap.ForeColor = System.Drawing.Color.DimGray;
- this.cmdMap.Location = new System.Drawing.Point(95, 31);
- this.cmdMap.Name = "cmdMap";
- this.cmdMap.Size = new System.Drawing.Size(65, 23);
- this.cmdMap.TabIndex = 66;
- this.cmdMap.Text = "Location";
- this.cmdMap.UseVisualStyleBackColor = true;
- //
- // cmdAuthirizationPanel1
- //
- this.cmdAuthirizationPanel1.Cursor = System.Windows.Forms.Cursors.Hand;
- this.cmdAuthirizationPanel1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdAuthirizationPanel1.FlatAppearance.BorderSize = 0;
- this.cmdAuthirizationPanel1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdAuthirizationPanel1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.cmdAuthirizationPanel1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.cmdAuthirizationPanel1.Font = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cmdAuthirizationPanel1.ForeColor = System.Drawing.Color.DarkGoldenrod;
- this.cmdAuthirizationPanel1.Location = new System.Drawing.Point(4, 31);
- this.cmdAuthirizationPanel1.Name = "cmdAuthirizationPanel1";
- this.cmdAuthirizationPanel1.Size = new System.Drawing.Size(95, 23);
- this.cmdAuthirizationPanel1.TabIndex = 65;
- this.cmdAuthirizationPanel1.Text = "Authorization";
- this.cmdAuthirizationPanel1.UseVisualStyleBackColor = true;
- //
- // WindowMonitoring
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
- this.ClientSize = new System.Drawing.Size(1443, 1053);
- this.Controls.Add(this.cmdVersion1);
- this.Controls.Add(this._mapToolbarControl1);
- this.Controls.Add(this.cmdOpenWebBrowser1);
- this.Controls.Add(this.cmdShowContainerBookmarks1);
- this.Controls.Add(this.cmdShowContainerPilots1);
- this.Controls.Add(this.cmdShowContainerSolarSystem1);
- this.Controls.Add(this.cmdMap);
- this.Controls.Add(this.cmdAuthirizationPanel1);
- this.Controls.Add(this.TitleBar);
- this.Controls.Add(this.VersionBar);
- this.Controls.Add(this.pnlContainer);
- this.DoubleBuffered = true;
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Name = "WindowMonitoring";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "EveJima";
- this.Activated += new System.EventHandler(this.WindowMonitoring_Activated);
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.WindowMonitoring_FormClosing);
- this.Load += new System.EventHandler(this.WindowMonitoring_Load);
- this.Shown += new System.EventHandler(this.WindowMonitoring_Shown);
- this.ResizeEnd += new System.EventHandler(this.Event_WindowEndResize);
- this.LocationChanged += new System.EventHandler(this.Event_LocationChange);
- this.DoubleClick += new System.EventHandler(this.Event_WindowDoubleClick);
- this.Resize += new System.EventHandler(this.Event_WindowResize);
- this.TitleBar.ResumeLayout(false);
- this.VersionBar.ResumeLayout(false);
- this.VersionBar.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.Button cmdClose;
- private System.Windows.Forms.Button cmdMinimazeRestore;
- private System.Windows.Forms.Button cmdPin;
- //private System.Windows.Forms.Label lblSolarSystemName;
- public System.Windows.Forms.Panel pnlContainer;
- private System.Windows.Forms.Label label18;
- private System.Windows.Forms.Label label19;
- private System.Windows.Forms.Label label20;
- private System.Windows.Forms.Label lblVersionID;
- private System.Windows.Forms.Button btnOpenBrowserAndStartUrl;
- private System.Windows.Forms.Panel TitleBar;
- private System.Windows.Forms.Panel VersionBar;
- private System.Windows.Forms.Label label1;
- private whlButton cmdVersion;
- private System.Windows.Forms.Button btnBrowserMax;
- private System.Windows.Forms.Button btnBrowserMin;
- private System.Windows.Forms.NotifyIcon crlNotificay;
- private System.Windows.Forms.Button cmdHide;
- private System.Windows.Forms.Timer RefreshActivePilot;
- private WhlControls.ejButton cmdAuthirizationPanel1;
- private WhlControls.ejButton cmdMap;
- private WhlControls.ejButton cmdShowContainerSolarSystem1;
- private WhlControls.ejButton cmdShowContainerPilots1;
- private WhlControls.ejButton cmdShowContainerBookmarks1;
- private WhlControls.ejButton cmdOpenWebBrowser1;
- private Logic.ToolBar.MapToolbarControl _mapToolbarControl1;
- private WhlControls.ejButton cmdVersion1;
- }
-}
\ No newline at end of file
diff --git a/Client/EvaJimaCore/WindowMonitoring.cs b/Client/EvaJimaCore/WindowMonitoring.cs
deleted file mode 100644
index 0ea0a65..0000000
--- a/Client/EvaJimaCore/WindowMonitoring.cs
+++ /dev/null
@@ -1,975 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Windows.Forms;
-using EvaJimaCore;
-using EvaJimaCore.Ui;
-using EveJimaCore.BLL;
-using EveJimaCore.Logic;
-using EveJimaCore.Logic.MapInformation;
-using EveJimaCore.Properties;
-using EveJimaCore.Ui;
-using EveJimaCore.UiTools;
-using EveJimaCore.WhlControls;
-using EveJimaUniverse;
-using log4net;
-
-namespace EveJimaCore
-{
- public partial class WindowMonitoring : Form
- {
-
- #region private variables
- private static readonly ILog Log = LogManager.GetLogger(typeof(WindowMonitoring));
- private bool _windowIsPinned;
- private bool _windowIsMinimaze;
- #endregion
-
- public Tabs ContainerTabs { get; set; }
-
-
-
- private readonly whlPilotInfo _containerPilotInfo = new whlPilotInfo();
- private whlBookmarks _containerBookmarks;
- private whlSolarSystem _containerSolarSystem;
- private whlTravelHistory _containerTravelHistory;
- private whlAuthorization _containerAuthorization;
- private whlSolarSystemOffline _containerSolarSystemOffline;
- private whlVersion _containerVersion;
- private ucRichBrowser _containerBrowser;
- //private crlSpaceMap _containerMap;
- private MapControl _containerMap;
- private whlLostAndFoundOffice _containerLostAndFoundOffice;
- private whlRouter _containerRouter;
-
- private bool isLoaded = false;
-
- #region WinAPI
-
- public const int WM_NCLBUTTONDOWN = 0xA1;
- public const int HT_CAPTION = 0x2;
-
- public bool IsWebBrowserMaximize = false;
-
- [DllImport("user32.dll")]
- public static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
-
- [DllImport("user32.dll")]
- public static extern bool ReleaseCapture();
-
- #endregion
-
- public LabelWithOptionalCopyTextOnDoubleClick lblSolarSystemName;
-
- public WindowMonitoring()
- {
- try
- {
- InitializeComponent();
-
- ContainersInitialization();
-
- ContainerTabs = new Tabs { Parent = this };
-
- ContainerTabs.OnChangeTab += Event_OnChangeActiveTab;
-
- ContainerTabs.AddTab("Authorization", TabSize.Small, cmdAuthirizationPanel1, _containerAuthorization);
- //ContainerTabs.AddTab("Location", TabSize.Small, cmdLocation1, _containerSolarSystem);
- ContainerTabs.AddTab("SolarSystem", TabSize.Small, cmdShowContainerSolarSystem1, _containerSolarSystemOffline);
- ContainerTabs.AddTab("Pilots", TabSize.Small, cmdShowContainerPilots1, _containerPilotInfo);
- ContainerTabs.AddTab("Bookmarks", TabSize.Small, cmdShowContainerBookmarks1, _containerBookmarks);
- //ContainerTabs.AddTab("Signatures", TabSize.Small, null, _containerTravelHistory);
- ContainerTabs.AddTab("WebBrowser", TabSize.Large, cmdOpenWebBrowser1, _containerBrowser);
- ContainerTabs.AddTab("Map", TabSize.Map, cmdMap, _containerMap);
- ContainerTabs.AddTab("Version", TabSize.Large, cmdVersion1, _containerVersion);
- //ContainerTabs.AddTab("LostAndFoundOffice", TabSize.Small, null, _containerLostAndFoundOffice);
- //ContainerTabs.AddTab("Router", TabSize.Small, null, _containerRouter);
-
- //cmdMap _containerMap
-
- ContainerTabs.Activate("Authorization");
-
- Size = ContainerTabs.Active().Size;
-
- lblSolarSystemName = new LabelWithOptionalCopyTextOnDoubleClick
- {
- BackColor = Color.Transparent,
- Font = new Font("Verdana", 8.25F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))),
- ForeColor = Color.LightGray,
- Location = new Point(6, 5),
- Name = "lblSolarSystemName",
- Size = new Size(252, 18),
- TabIndex = 5
- };
-
- lblSolarSystemName.MouseDown += Event_TitleBarMouseDown;
-
- lblSolarSystemName.DoubleClick += Event_TitleBarDoubleClick;
-
- TitleBar.Controls.Add(lblSolarSystemName);
-
- Global.Pilots.OnActivatePilot += GlobalEvent_ActivatePilot;
- Global.InternalBrowser.OnBrowserNavigate += Event_BrowserNavigate;
-
- DelegateStartProcess startProcessFunction = StartPilotAuthorizeFlow;
- new Thread(() => new CrestApiListener().ListenLocalhost(startProcessFunction)) { IsBackground = true }.Start();
- }
- catch (Exception ex)
- {
- Log.ErrorFormat("[WindowMonitoring.WindowMonitoring] Critical error {0}", ex);
- }
- }
-
- private void GlobalEvent_ActivatePilot(PilotEntity pilot)
- {
- Log.DebugFormat("[WindowMonitoring.GlobalEvent_ActivatePilot] Before ContainerEvent_ChangeSolarSystemInfo : {0}", pilot.Name);
- ContainerEvent_ChangeSolarSystemInfo(Global.Space.GetTitle(pilot.Location));
- Log.DebugFormat("[WindowMonitoring.GlobalEvent_ActivatePilot] Before ActivateLocationTab : {0}", pilot.Name);
- ActivateLocationTab();
- Log.DebugFormat("[WindowMonitoring.GlobalEvent_ActivatePilot] End : {0}", pilot.Name);
- }
-
- private void ActivateLocationTab()
- {
- if (InvokeRequired)
- {
- Invoke(new Action(() => ActivateLocationTab()));
- }
-
- if(Global.Pilots.Selected.Location.Id == null)
- {
- cmdMap.ForeColor = Color.DimGray;
- }
- else
- {
- cmdMap.ForeColor = Color.Silver;
- }
- }
-
- private void WaitKey()
- {
- while (this.IsHandleCreated)
- {
-
- short res1 = GetAsyncKeyState(VK_SHIFT);
- short res2 = GetAsyncKeyState(VK_Z);
- if (res1 != 0 && res2 != 0)
- MessageBox.Show("Hello");
- }
- }
-
-
- public const int VK_SHIFT = 0x10;
- public const int VK_Z = 0x5A;
-
- [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
- internal static extern short GetAsyncKeyState(int vkey);
-
- protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
- {
- if (keyData == (Keys.Control | Keys.F))
- {
-
- var txtInClip = Clipboard.GetText();
-
- var parts = txtInClip.Split('\t');
-
- if (parts.Length == 6)
- {
- var signatureCode = parts[0];
- var signatureType = parts[2];
- var signatureName = parts[3];
-
- var label = "";
-
- label = "[" + signatureCode + "]";
-
- if (signatureType.ToUpper().IndexOf("ЧЕРВОТОЧИНА") > -1 || signatureType.ToUpper().IndexOf("WORMHOLE") > -1)
- {
- label = "WH " + label + "";
- }
-
- if (signatureType.ToUpper().IndexOf("ГАЗ") > -1 || signatureType.ToUpper().IndexOf("GAS SITE") > -1)
- {
- label = "Gas " + label + " " + signatureName;
- }
-
- if (signatureType.ToUpper().IndexOf("ДАННЫЕ") > -1 || signatureType.ToUpper().IndexOf("DATA SITE") > -1)
- {
- label = "Data " + label + " " + signatureName;
- }
-
- if (signatureType.ToUpper().IndexOf("АРТЕФАКТЫ") > -1 || signatureType.ToUpper().IndexOf("RELIC SITE") > -1)
- {
- label = "Relic " + label + " " + signatureName;
- }
- try
- {
- Clipboard.SetText(label);
- }
- catch(Exception)
- {
-
- //throw;
- }
-
- }
-
- return true;
- }
- return base.ProcessCmdKey(ref msg, keyData);
- }
-
- protected override void WndProc(ref Message m)
- {
- if (ContainerTabs == null || ContainerTabs.Active() == null) return;
-
- if (ContainerTabs.Active().Name != "WebBrowser" && ContainerTabs.Active().Name != "Map")
- {
- base.WndProc(ref m);
- return;
- }
-
- // Resize form
-
- const UInt32 WM_NCHITTEST = 0x0084;
- const UInt32 WM_MOUSEMOVE = 0x0200;
-
- const UInt32 HTLEFT = 10;
- const UInt32 HTRIGHT = 11;
- const UInt32 HTBOTTOMRIGHT = 17;
- const UInt32 HTBOTTOM = 15;
- const UInt32 HTBOTTOMLEFT = 16;
- const UInt32 HTTOP = 12;
- const UInt32 HTTOPLEFT = 13;
- const UInt32 HTTOPRIGHT = 14;
-
- const int RESIZE_HANDLE_SIZE = 10;
- bool handled = false;
- if (m.Msg == WM_NCHITTEST || m.Msg == WM_MOUSEMOVE)
- {
- Size formSize = this.Size;
- Point screenPoint = new Point(m.LParam.ToInt32());
- Point clientPoint = this.PointToClient(screenPoint);
-
- Dictionary boxes = new Dictionary() {
- {HTBOTTOMLEFT, new Rectangle(0, formSize.Height - RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE)},
- {HTBOTTOM, new Rectangle(RESIZE_HANDLE_SIZE, formSize.Height - RESIZE_HANDLE_SIZE, formSize.Width - 2*RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE)},
- {HTBOTTOMRIGHT, new Rectangle(formSize.Width - RESIZE_HANDLE_SIZE, formSize.Height - RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE)},
- {HTRIGHT, new Rectangle(formSize.Width - RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE, formSize.Height - 2*RESIZE_HANDLE_SIZE)},
- {HTTOPRIGHT, new Rectangle(formSize.Width - RESIZE_HANDLE_SIZE, 0, RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE) },
- {HTTOP, new Rectangle(RESIZE_HANDLE_SIZE, 0, formSize.Width - 2*RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE) },
- {HTTOPLEFT, new Rectangle(0, 0, RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE) },
- {HTLEFT, new Rectangle(0, RESIZE_HANDLE_SIZE, RESIZE_HANDLE_SIZE, formSize.Height - 2*RESIZE_HANDLE_SIZE) }
- };
-
- foreach (KeyValuePair hitBox in boxes)
- {
- if (hitBox.Value.Contains(clientPoint))
- {
- m.Result = (IntPtr)hitBox.Key;
- handled = true;
- break;
- }
- }
-
- }
-
- if (!handled)
- base.WndProc(ref m);
- }
-
- private void Event_OnChangeActiveTab(string tabName)
- {
- if (tabName == "WebBrowser")
- {
- if (_containerBrowser.isMaxMode == false)
- {
- btnOpenBrowserAndStartUrl.Visible = false;
- btnBrowserMin.Location = btnOpenBrowserAndStartUrl.Location;
- btnBrowserMin.Visible = false;
- btnBrowserMax.Location = btnOpenBrowserAndStartUrl.Location;
- btnBrowserMax.Visible = true;
- }
- else
- {
- btnOpenBrowserAndStartUrl.Visible = false;
- btnBrowserMax.Location = btnOpenBrowserAndStartUrl.Location;
- btnBrowserMax.Visible = false;
- btnBrowserMin.Location = btnOpenBrowserAndStartUrl.Location;
- btnBrowserMin.Visible = true;
- }
- }
- else
- {
- btnBrowserMax.Visible = false;
- btnOpenBrowserAndStartUrl.Visible = true;
- }
- }
-
- private void ContainersInitialization()
- {
- _containerSolarSystem = new whlSolarSystem();
- #region Events
- //_containerSolarSystem.OnChangeSolarSystemInfo += ContainerEvent_ChangeSolarSystemInfo;
- _containerSolarSystem.OnShowTravelHistory += ContainerEvent_ShowTravelHistory;
- _containerSolarSystem.OnShowLostAndFoundOffice += ContainerEvent_ShowLostAndFoundOffice;
- _containerSolarSystem.OnBrowserNavigate += Event_BrowserNavigate;
- _containerSolarSystem.OnContainerActivate += ContainerEvent_Activate;
- #endregion
-
- _containerTravelHistory = new whlTravelHistory();
- #region Events
- _containerTravelHistory.OnShowLocation += ContainerEvent_ShowLocation;
- #endregion
-
- _containerBrowser = new ucRichBrowser();
- #region Events
- _containerSolarSystemOffline = new whlSolarSystemOffline();
-
- //_containerSolarSystemOffline.OnBrowserNavigate += Event_BrowserNavigate;
- #endregion
-
- _containerMap = new MapControl();
- //OnChangeSolarSystem += _containerMap.ChangeCurrentLocation;
-
- _containerVersion = new whlVersion();
-
- _containerBookmarks = new whlBookmarks();
-
- _containerAuthorization = new whlAuthorization();
- #region Events
- _containerAuthorization.OnChangeSelectedPilot += ContainerEvent_ChangeSelectedPilot;
- #endregion
-
- _containerLostAndFoundOffice = new whlLostAndFoundOffice();
- #region Events
- _containerLostAndFoundOffice.OnShowSolarSystem += ContainerEvent_ShowSolarSystem;
- #endregion
-
- _containerRouter = new whlRouter();
- #region Events
- _containerRouter.OnContainerActivate += ContainerEvent_Activate;
- #endregion
-
- pnlContainer.Controls.Add(_containerPilotInfo);
- pnlContainer.Controls.Add(_containerBookmarks);
- pnlContainer.Controls.Add(_containerSolarSystem);
- pnlContainer.Controls.Add(_containerTravelHistory);
- pnlContainer.Controls.Add(_containerSolarSystemOffline);
- pnlContainer.Controls.Add(_containerVersion);
- pnlContainer.Controls.Add(_containerAuthorization);
- pnlContainer.Controls.Add(_containerLostAndFoundOffice);
- pnlContainer.Controls.Add(_containerRouter);
- pnlContainer.Controls.Add(_containerMap);
-
- _containerBrowser.ChangeViewMode += ChangeViewMode;
-
- pnlContainer.Controls.Add(_containerBrowser);
-
- _containerPilotInfo.OnBrowserNavigate += Event_BrowserNavigate;
-
- _containerBrowser.ParentWindow = this;
- }
-
- private void ContainerEvent_Activate(string name)
- {
- ContainerTabs.Activate(name);
- }
-
- private void ContainerEvent_ShowLostAndFoundOffice()
- {
- _containerLostAndFoundOffice.Refresh(Global.Pilots.Selected);
- ContainerTabs.Activate("LostAndFoundOffice");
- }
-
- private void ContainerEvent_ShowSolarSystem()
- {
- ContainerTabs.Activate("Location");
- }
-
- private void WindowMonitoring_Load(object sender, EventArgs e)
- {
- lblVersionID.Text = Global.ApplicationSettings.CurrentVersion;
-
- Log.DebugFormat("[WindowMonitoring] Version: {0}", lblVersionID.Text);
-
- CreateTooltipsForStatics();
-
-
-
- SetStyle(ControlStyles.ResizeRedraw, true);
-
- _containerAuthorization.RefreshAuthorizationStatus();
-
- if (IsNeedUpdateApplication() == false)
- {
- ContainerTabs.Activate("Authorization");
- OpenAuthorizationPanel();
- }
- else
- {
- ContainerTabs.Activate("Version");
- }
-
- Size = ContainerTabs.Active().Size;
-
- Global.Pilots.OnAddPilot += GlobalEvent_AddNewPilot;
-
- //TODO: Recomment before create version!!!
- Global.Metrics.PublishOnApplicationStart(Global.Settings.CurrentVersion);
- }
-
- private void GlobalEvent_AddNewPilot(PilotEntity pilot)
- {
- pilot.OnChangeSolarSystem += GlobalEvent_PilotChangeLocation;
- }
-
- private void GlobalEvent_PilotChangeLocation(PilotEntity pilot, string systemfrom, string systemto)
- {
- if (Global.Pilots.Selected.Id != pilot.Id) return;
-
- ContainerEvent_ChangeSolarSystemInfo(Global.Space.GetTitle(pilot.Location));
-
- //_containerMap.Relocation(pilot, systemfrom, systemto, true);
-
- //_containerMap.Refresh();
-
-
-
- //RefreshSolarSystemInformation(pilot.Location);
- }
-
- private void Event_BrowserNavigate(string address)
- {
- _containerBrowser.BrowserUrlExecute(address);
- ContainerTabs.Activate("WebBrowser");
- }
-
- private void ContainerEvent_ChangeSelectedPilot()
- {
- if (InvokeRequired)
- {
- Invoke(new Action(() => ContainerEvent_ChangeSelectedPilot()));
- }
- try
- {
- Log.DebugFormat("[WindowMonitoring.Event_ChangeSelectedPilot] Global.Pilots.Selected.Location.Id {0}", Global.Pilots.Selected.Location.Id);
- if (Global.Pilots.Selected.Location.Id != null)
- {
- RefreshSolarSystemInformation(Global.Pilots.Selected.Location);
- if(Global.Pilots.Selected.Key == "")
- {
- Global.Pilots.Selected.Key = Global.Pilots.Selected.Name;
- //Global.Pilots.Selected.SpaceMap = Global.Pilots.Selected.Name;
- }
- _containerMap = new MapControl();
- _containerMap.ActivateContainer();
- //ContainerTabs.AddTab("Map", TabSize.Map, cmdMap, _containerMap);
- }
- else
- {
-
- }
- }
- catch (Exception ex)
- {
- Log.ErrorFormat("[WindowMonitoring.Event_ChangeSelectedPilot] Critical error. Exception {0}", ex);
- }
- Log.DebugFormat("[WindowMonitoring.Event_ChangeSelectedPilot] end");
- }
-
-
- private void ChangeViewMode(bool ismax)
- {
- IsWebBrowserMaximize = ismax;
-
- _containerBrowser.isMaxMode = ismax;
-
- if (ismax)
- {
- FixBrowserSize();
- }
- else
- {
- pnlContainer.Location = new Point(11, 63);
-
- btnOpenBrowserAndStartUrl.Visible = true;
- }
-
- ContainerTabs.Activate("WebBrowser");
-
- TitleBar.BringToFront();
- }
-
- private void FixBrowserSize()
- {
- var positionLeft = 5;
-
- if (_containerBrowser.IsShowFavorites)
- {
- pnlContainer.Location = new Point(positionLeft - 0, -57);
- pnlContainer.Width = Width - 10;
- pnlContainer.Height = Height + 54;
- }
- else
- {
- pnlContainer.Location = new Point(positionLeft, -57);
- pnlContainer.Width = Width - 8;
- pnlContainer.Height = Height + 54;
- }
-
- _containerBrowser.Size = pnlContainer.Size;
- _containerBrowser.FixSize(true);
-
- pnlContainer.BringToFront();
- }
-
- private void ContainerEvent_ChangeSolarSystemInfo(string info)
- {
- if (InvokeRequired)
- {
- Invoke(new Action(() => ContainerEvent_ChangeSolarSystemInfo(info)));
- }
-
- lblSolarSystemName.Text = info;
-
- if (Visible == false)
- {
- if (Tools.IsWSpaceSystem(Global.Pilots.Selected.Location.Name))
- {
- crlNotificay.BalloonTipTitle = @"EveJima";
- crlNotificay.BalloonTipText = @"Active pilot enter to new location. " + info;
-
- crlNotificay.Visible = true;
- crlNotificay.ShowBalloonTip(500);
- }
- }
- }
-
-
- private void ContainerEvent_ShowTravelHistory()
- {
- if (Global.Pilots.Count() == 0 || Global.Pilots.Selected == null || Global.Pilots.Selected.Location == null || Global.Pilots.Selected.Location.Name == "unknown") return;
-
- ContainerTabs.Activate("Signatures");
- }
-
-
- private void ContainerEvent_ShowLocation()
- {
- if (Global.Pilots.Count() == 0 || Global.Pilots.Selected == null || Global.Pilots.Selected.Location == null || Global.Pilots.Selected.Location.Name == "unknown") return;
-
- ContainerTabs.Activate("Location");
- }
-
- private bool IsNeedUpdateApplication()
- {
- try
- {
- if (Global.Settings.Version != Global.Settings.CurrentVersion.Trim())
- {
- Log.DebugFormat("Current version is {0}", Global.Settings.CurrentVersion);
- Log.DebugFormat("Evajime last version is {0}", Global.Settings.Version);
-
- return true;
- }
- }
- catch (Exception ex)
- {
- Log.ErrorFormat("[WindowMonitoring.CheckVersion] Critical error. Exception {0}", ex);
- }
-
- return false;
- }
-
-
- private void DrawPilotPanel(PilotEntity pilot)
- {
- if (pilot.Location != null && pilot.Location.Name != "unknown")
- {
- //cmdLocation.IsActive = true;
- //cmdLocation.Refresh();
- }
- }
-
- private void CreateTooltipsForStatics()
- {
- var toolTipUrlButton = new ToolTip
- {
- AutoPopDelay = 5000,
- InitialDelay = 1000,
- ReshowDelay = 500,
- ShowAlways = true
- };
-
- toolTipUrlButton.SetToolTip(btnOpenBrowserAndStartUrl, "Open WHL brouser and start url");
-
- var toolTipHideButton = new ToolTip
- {
- AutoPopDelay = 5000,
- InitialDelay = 1000,
- ReshowDelay = 500,
- ShowAlways = true
- };
-
- toolTipHideButton.SetToolTip(cmdHide, "Hide");
- }
-
- public void StartPilotAuthorizeFlow(string value)
- {
- if (InvokeRequired)
- {
- Invoke(new Action(StartPilotAuthorizeFlow), value);
- return;
- }
-
- Log.DebugFormat("[WindowMonitoring.StartPilotAuthorizeFlow] get value: {0}", value);
-
- _containerAuthorization.PilotAuthorizeFlow(value);
-
- BringApplicationToFront();
-
- RefreshSolarSystemInformation(Global.Pilots.Selected.Location);
-
- DrawPilotPanel(Global.Pilots.Selected);
-
- OpenAuthorizationPanel();
-
- Global.Pilots.Selected.Key = Global.Pilots.Selected.Name;
- Global.Pilots.Selected.SpaceMap.Key = Global.Pilots.Selected.Name;
- Global.Pilots.Selected.SpaceMap.GetUpdates();
- }
-
- public void BringApplicationToFront()
- {
- if (InvokeRequired)
- {
- Invoke(new Action(BringApplicationToFront));
- }
- else
- {
- var topMost = TopMost;
-
- TopMost = true;
- Focus();
- BringToFront();
- System.Media.SystemSounds.Beep.Play();
- TopMost = topMost;
- }
- }
-
- private void OpenAuthorizationPanel()
- {
- ContainerTabs.Activate("Authorization");
-
- if (Global.Pilots.Selected != null)
- {
- _containerAuthorization.RefreshPilotInfo();
- }
- }
-
- private void Event_OpenBrowserContainer(object sender, EventArgs e)
- {
- ContainerTabs.Activate("WebBrowser");
-
- var urlFromClipboard = Clipboard.GetText();
-
- if (urlFromClipboard.StartsWith("http"))
- {
- _containerBrowser.BrowserUrlExecute(urlFromClipboard);
- }
-
- _windowIsMinimaze = false;
- cmdMinimazeRestore.Image = Resources.minimize;
- }
-
- #region GUI
-
- protected override void OnPaint(PaintEventArgs e)
- {
- base.OnPaint(e);
-
- e.Graphics.FillRectangle(new SolidBrush(Color.Black), 0, 0, Width, 28);
-
- e.Graphics.DrawRectangle(new Pen(Color.DarkGray, 2), 0, 0, Width, Height);
- }
-
- private void cmdClose_Click(object sender, EventArgs e)
- {
- Close();
- }
-
- private void cmdPin_Click(object sender, EventArgs e)
- {
- _windowIsPinned = !_windowIsPinned;
- SetPinned();
- }
-
- private void SetPinned()
- {
- if (_windowIsPinned)
- {
- cmdPin.Image = Resources.pin;
- TopMost = true;
- }
- else
- {
- cmdPin.Image = Resources.unpin;
- TopMost = false;
- }
-
- Global.WorkEnvironment.IsPinned = _windowIsPinned;
- }
-
- private void cmdMinimazeRestore_Click(object sender, EventArgs e)
- {
- if (_windowIsMinimaze)
- {
- _windowIsMinimaze = false;
- cmdMinimazeRestore.Image = Resources.minimize;
- Size = ContainerTabs.Active().Size;
- }
- else
- {
- _windowIsMinimaze = true;
- cmdMinimazeRestore.Image = Resources.restore;
- Size = ContainerTabs.Active().CompactSize;
- }
-
- TitleBar.Width = Width;
-
- }
- #endregion
-
- private void Event_WindowDoubleClick(object sender, EventArgs e)
- {
- MinMaxFormResize();
- }
-
- private void MinMaxFormResize()
- {
- if (_windowIsMinimaze)
- {
- _windowIsMinimaze = false;
- cmdMinimazeRestore.Image = Resources.minimize;
- Size = new Size(ContainerTabs.Active().Size.Width, ContainerTabs.Active().Size.Height);
- }
- else
- {
- _windowIsMinimaze = true;
- cmdMinimazeRestore.Image = Resources.restore;
- Size = new Size(ContainerTabs.Active().CompactSize.Width, ContainerTabs.Active().CompactSize.Height);
- }
- }
-
- private void Event_TitleBarDoubleClick(object sender, EventArgs e)
- {
- if (_windowIsMinimaze)
- {
- _windowIsMinimaze = false;
- cmdMinimazeRestore.Image = Resources.minimize;
- Size = ContainerTabs.Active().Size;
- TitleBar.Width = Width;
- }
- else
- {
- _windowIsMinimaze = true;
- cmdMinimazeRestore.Image = Resources.restore;
- Size = ContainerTabs.Active().CompactSize;
- TitleBar.Width = Width;
- }
- }
-
-
- private void Event_TitleBarMouseDown(object sender, MouseEventArgs e)
- {
- if (e.Button == MouseButtons.Left && e.Clicks == 1)
- {
- ReleaseCapture();
- SendMessage(Handle, WM_NCLBUTTONDOWN, HT_CAPTION, 0);
- }
- }
-
- private void RefreshSolarSystemInformation(EveJimaUniverse.System location)
- {
- if (InvokeRequired)
- {
- Invoke(new Action(() => RefreshSolarSystemInformation(location)));
- }
-
- if (Global.Pilots.Count() > 0)
- {
- _containerSolarSystem.RefreshSolarSystem(location);
- //_containerTravelHistory.RefreshSolarSystem(location);
- }
- }
-
- private void WindowMonitoring_FormClosing(object sender, FormClosingEventArgs e)
- {
- if(_containerVersion == null) return;
-
- _containerVersion.DisposeBrowser();
- _containerVersion = null;
-
- _containerBrowser.DisposeBrowser();
- _containerBrowser = null;
-
- Global.WorkEnvironment.SaveChanges();
- }
-
- private void btnBrowserMax_Click(object sender, EventArgs e)
- {
- ChangeViewMode(true);
- }
-
- private void btnBrowserMin_Click(object sender, EventArgs e)
- {
- ChangeViewMode(false);
- }
-
- private void crlNotificay_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- Show();
- WindowState = FormWindowState.Normal;
- }
-
- private void Event_Hide(object sender, EventArgs e)
- {
- crlNotificay.BalloonTipTitle = "EveJima";
- crlNotificay.BalloonTipText = @"EveJima waits actions in tray.";
-
- crlNotificay.Visible = true;
- crlNotificay.ShowBalloonTip(200);
- Hide();
- }
-
- private void Event_WindowResize(object sender, EventArgs e)
- {
- if (_windowIsMinimaze) return;
-
- TitleBar.Width = Width;
-
- VersionBar.Width = Width;
- VersionBar.Location = new Point(0, Height - 32);
-
- if (ContainerTabs.Active().Name == "WebBrowser")
- {
- if (IsWebBrowserMaximize)
- {
- FixBrowserSize();
- ContainerTabs.Activate("WebBrowser");
- ContainerTabs.Active().Size = new Size(Width, Height);
- TitleBar.BringToFront();
- }
- else
- {
- ContainerTabs.Active().Size = new Size(Width, Height);
- ContainerTabs.Resize();
- }
- }
-
- if(ContainerTabs.Active().Name == "Map")
- {
- ContainerTabs.Active().Size = new Size(Width, Height);
- ContainerTabs.Resize();
- }
-
- }
-
- private void Event_RefreshActivePilot(object sender, EventArgs e)
- {
- if (Global.Pilots.Count() > 0)
- {
- try
- {
- var activeProgramName = Tools.GetActiveWindowTitle();
-
- if (activeProgramName == null) return;
-
- //Log.DebugFormat("[WindowMonitoring.Event_RefreshActivePilot] Active title {0}", activeProgramName);
-
- if (!activeProgramName.StartsWith("EVE - ")) return;
-
- var pilotName = activeProgramName.Replace("EVE - ", "") + "";
-
- //Log.DebugFormat("[WindowMonitoring.Event_RefreshActivePilot] pilotName {0}", pilotName);
- //Log.DebugFormat("[WindowMonitoring.Event_RefreshActivePilot] Global.Pilots.Selected.Name {0}", Global.Pilots.Selected.Name);
-
- if (pilotName == Global.Pilots.Selected.Name) return;
-
- Global.Pilots.Activate(pilotName);
-
- _containerAuthorization.SelectPilot(pilotName);
- }
- catch (Exception ex)
- {
- Log.ErrorFormat("[WindowMonitoring.Event_RefreshActivePilot] Critical error. Exception {0}", ex);
- }
- }
- }
-
-
- private void Event_LocationChange(object sender, EventArgs e)
- {
- if (isLoaded == false) return;
-
- Global.WorkEnvironment.LocationMaximizeX = Location.X;
- Global.WorkEnvironment.LocationMaximizeY = Location.Y;
- }
-
- private void WindowMonitoring_Activated(object sender, EventArgs e)
- {
- if (isLoaded == false)
- {
- Location = new Point(Global.WorkEnvironment.LocationMaximizeX, Global.WorkEnvironment.LocationMaximizeY);
- isLoaded = true;
-
- _windowIsPinned = Global.WorkEnvironment.IsPinned;
-
- SetPinned();
-
-
- //Thread.Sleep(3000);
- //var screen = new ScreenUpdateToServer { ActionType = "LoadAllPilotesFromStorage" };
- //screen.AuthorizeAllPilotsInAccount += _containerAuthorization.AuthorizeAllPilotsInAccount;
- //screen.ShowDialog();
- //_containerAuthorization.LoadAllPilotesFromStorage();
- //LoadAllPilotesFromStorage();
- //MessageBox.Show("1");
-
-
-
-
- }
- }
-
- private void Event_WindowEndResize(object sender, EventArgs e)
- {
- if(ContainerTabs.Active().Name == "Map")
- {
- _containerMap.Event_Map_OnResize();
- }
- }
-
- private void WindowMonitoring_Shown(object sender, EventArgs e)
- {
- //Thread.Sleep(3000);
- //var screen = new ScreenUpdateToServer { ActionType = "LoadAllPilotesFromStorage" };
- //screen.AuthorizeAllPilotsInAccount += _containerAuthorization.AuthorizeAllPilotsInAccount;
- //screen.ShowDialog();
- //_containerAuthorization.LoadAllPilotesFromStorage();
- //LoadAllPilotesFromStorage();
-
-
-
-
-
- }
-
-
- }
-}
diff --git a/Client/EvaJimaCore/WindowMonitoring.resx b/Client/EvaJimaCore/WindowMonitoring.resx
deleted file mode 100644
index 5e6724b..0000000
--- a/Client/EvaJimaCore/WindowMonitoring.resx
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 173, 17
-
-
-
-
- AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
- AAD///8B////Af///wH///8B/f39pf7+/tv+/v79///////////+/v79/v7+2/39/aX///8B////Af//
- /wH///8B////Af///wH///8B////Afz8/B39/f0x/f39v////////////f39v/39/TH8/Pwd////Af//
- /wH///8B////Af///wH///8B////Af///wH///8B////Af39/YH///////////39/YH///8B////Af//
- /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH7+/tB/f39gf39/YH7+/tB////Af//
- /wH///8B////Af///wH///8B/Pz8Vf39/X/9/f2B/f39gf39/YH9/f2B/f39gf39/YH9/f2B/f39gf39
- /YH9/f2B/f39gf39/YH9/f1//Pz8Vf39/dv9/f2V/f39gf39/YH9/f2B/f39gf39/YH9/f2B/f39gf39
- /YH9/f2B/f39gf39/YH9/f2B/f39lf39/dv+/v7V/f39K////wH///8B////Af///wH///8B////Af//
- /wH///8B////Af///wH///8B////Af39/Sv+/v7V/v7+1f39/SsftuULH7TidSC04qsgtOKrILTiqyC1
- 428gteM7H7TjnR+14ZcetuIt////Af///wH9/f0r/v7+1f7+/tX9/f0rH7blER604q8fteKD////Af//
- /wEhsegFH7Tiyx6044EftOKJH7Tivf///wH///8B/f39K/7+/tX+/v7V/f39Kx+25REetOKvH7Xig///
- /wH///8BIbHoBSC04kkfteIhHrTibx604tP///8B////Af39/Sv+/v7V/v7+1f39/SsftuURHrTirx+1
- 4tUgtOKrILTioR+14T3///8B////AR604m8etOLT////Af///wH9/f0r/v7+1f7+/tX9/f0rH7blER60
- 4q8fteKD////Af///wH///8B////Af///wEetOJvHrTi0////wH///8B/f39K/7+/tX+/v7V/f39Kx+2
- 5REetOKvH7XirSC04lUftONVH7TiL////wH///8BHrTibx604tP///8B////Af39/Sv+/v7V/v7+1f39
- /SsftuUHH7TiOyC04lUgtOJVH7TjVR+04i////8B////AR+04iUftOJH////Af///wH9/f0r/v7+1f7+
- /tv9/f1P/f39K/39/Sv9/f0r/f39K/39/Sv9/f0r/f39K/39/Sv9/f0r/f39K/39/Sv9/f0r/f39T/7+
- /tv9/f2//v7+2/7+/tX+/v7V/v7+1f7+/tX+/v7V/v7+1f7+/tX+/v7V/v7+1f7+/tX+/v7V/v7+1f7+
- /tv9/f2/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
- //8AAP//AAD//w==
-
-
-
- 286, 17
-
-
-
- AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA
- AAD///8B////Af///wH///8B/f39pf7+/tv+/v79///////////+/v79/v7+2/39/aX///8B////Af//
- /wH///8B////Af///wH///8B////Afz8/B39/f0x/f39v////////////f39v/39/TH8/Pwd////Af//
- /wH///8B////Af///wH///8B////Af///wH///8B////Af39/YH///////////39/YH///8B////Af//
- /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH7+/tB/f39gf39/YH7+/tB////Af//
- /wH///8B////Af///wH///8B/Pz8Vf39/X/9/f2B/f39gf39/YH9/f2B/f39gf39/YH9/f2B/f39gf39
- /YH9/f2B/f39gf39/YH9/f1//Pz8Vf39/dv9/f2V/f39gf39/YH9/f2B/f39gf39/YH9/f2B/f39gf39
- /YH9/f2B/f39gf39/YH9/f2B/f39lf39/dv+/v7V/f39K////wH///8B////Af///wH///8B////Af//
- /wH///8B////Af///wH///8B////Af39/Sv+/v7V/v7+1f39/SsftuULH7TidSC04qsgtOKrILTiqyC1
- 428gteM7H7TjnR+14ZcetuIt////Af///wH9/f0r/v7+1f7+/tX9/f0rH7blER604q8fteKD////Af//
- /wEhsegFH7Tiyx6044EftOKJH7Tivf///wH///8B/f39K/7+/tX+/v7V/f39Kx+25REetOKvH7Xig///
- /wH///8BIbHoBSC04kkfteIhHrTibx604tP///8B////Af39/Sv+/v7V/v7+1f39/SsftuURHrTirx+1
- 4tUgtOKrILTioR+14T3///8B////AR604m8etOLT////Af///wH9/f0r/v7+1f7+/tX9/f0rH7blER60
- 4q8fteKD////Af///wH///8B////Af///wEetOJvHrTi0////wH///8B/f39K/7+/tX+/v7V/f39Kx+2
- 5REetOKvH7XirSC04lUftONVH7TiL////wH///8BHrTibx604tP///8B////Af39/Sv+/v7V/v7+1f39
- /SsftuUHH7TiOyC04lUgtOJVH7TjVR+04i////8B////AR+04iUftOJH////Af///wH9/f0r/v7+1f7+
- /tv9/f1P/f39K/39/Sv9/f0r/f39K/39/Sv9/f0r/f39K/39/Sv9/f0r/f39K/39/Sv9/f0r/f39T/7+
- /tv9/f2//v7+2/7+/tX+/v7V/v7+1f7+/tX+/v7V/v7+1f7+/tX+/v7V/v7+1f7+/tX+/v7V/v7+1f7+
- /tv9/f2/AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
- //8AAP//AAD//w==
-
-
-
\ No newline at end of file
diff --git a/Client/EvaJimaCore/WorkEnvironment.cs b/Client/EvaJimaCore/WorkEnvironment.cs
index 62e8c30..9238b79 100644
--- a/Client/EvaJimaCore/WorkEnvironment.cs
+++ b/Client/EvaJimaCore/WorkEnvironment.cs
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Windows.Forms;
+using EvaJimaCore;
using log4net;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -24,39 +25,12 @@ public WorkEnvironment()
try
{
- using (var reader = new StreamReader("EveJimaEnvironment.txt"))
- {
- dynamic data = JObject.Parse(reader.ReadToEnd());
-
- IsShowFavorites = data.IsShowFavorites != "false";
-
- try
- {
- LocationMaximizeX = data.LocationMaximizeX;
- LocationMaximizeY = data.LocationMaximizeY;
- }
- catch (Exception ex)
- {
- Log.ErrorFormat("[WorkEnvironment.WorkEnvironment] Critical error. Exception {0}", ex);
- }
-
- try
- {
- IsPinned = data.IsPinned;
- }
- catch (Exception ex)
- {
- Log.ErrorFormat("[WorkEnvironment.WorkEnvironment] Critical error. Exception {0}", ex);
- }
-
- }
+ IsShowFavorites = Global.ApplicationSettings.Browser_IsShowFavorites;
+ LocationMaximizeX = Global.ApplicationSettings.Browser_LocationMaximizeX;
+ LocationMaximizeY = Global.ApplicationSettings.Browser_LocationMaximizeY;
+ IsPinned = Global.ApplicationSettings.Browser_IsPinned;
- var screenCounts = 0;
-
- foreach (var screen in Screen.AllScreens)
- {
- screenCounts++;
- }
+ var screenCounts = Screen.AllScreens.Length;
if (screenCounts == 1)
{
@@ -74,9 +48,5 @@ public WorkEnvironment()
}
}
- public void SaveChanges()
- {
- File.WriteAllText(@"EveJimaEnvironment.txt", JsonConvert.SerializeObject(this));
- }
}
}
diff --git a/Client/EveJimaBrowser/EveJimaBrowser.csproj b/Client/EveJimaBrowser/EveJimaBrowser.csproj
index ffbb33a..6da04c5 100644
--- a/Client/EveJimaBrowser/EveJimaBrowser.csproj
+++ b/Client/EveJimaBrowser/EveJimaBrowser.csproj
@@ -222,9 +222,6 @@
Always
-
- Always
-