diff --git a/Application/RSBot/RSBot.csproj b/Application/RSBot/RSBot.csproj
index 8767dfe8..24a31b01 100644
--- a/Application/RSBot/RSBot.csproj
+++ b/Application/RSBot/RSBot.csproj
@@ -199,10 +199,6 @@
{b62c693a-62e0-4d29-8702-dd8b3b6b308b}
RSBot.Pk2
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
-
diff --git a/Application/RSBot/Views/About.Designer.cs b/Application/RSBot/Views/About.Designer.cs
index e24c6543..d5d3fb41 100644
--- a/Application/RSBot/Views/About.Designer.cs
+++ b/Application/RSBot/Views/About.Designer.cs
@@ -29,7 +29,7 @@ private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(About));
this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.buttonOk = new RSBot.Theme.Material.Button();
+ this.buttonOk = new System.Windows.Forms.Button();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.bottomPanel = new System.Windows.Forms.Panel();
this.labelName = new System.Windows.Forms.Label();
@@ -51,14 +51,8 @@ private void InitializeComponent()
//
// buttonOk
//
- this.buttonOk.Depth = 0;
- this.buttonOk.Icon = null;
this.buttonOk.Location = new System.Drawing.Point(203, 8);
- this.buttonOk.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonOk.Name = "buttonOk";
- this.buttonOk.Primary = true;
- this.buttonOk.Raised = true;
- this.buttonOk.SingleColor = System.Drawing.Color.Empty;
this.buttonOk.Size = new System.Drawing.Size(75, 23);
this.buttonOk.TabIndex = 0;
this.buttonOk.Text = "OK";
@@ -150,7 +144,7 @@ private void InitializeComponent()
#endregion
private System.Windows.Forms.PictureBox pictureBox1;
- private Theme.Material.Button buttonOk;
+ private System.Windows.Forms.Button buttonOk;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.Panel bottomPanel;
private System.Windows.Forms.Label labelName;
diff --git a/Application/RSBot/Views/Controls/Character.Designer.cs b/Application/RSBot/Views/Controls/Character.Designer.cs
index 3fdf0e6c..4eac09c2 100644
--- a/Application/RSBot/Views/Controls/Character.Designer.cs
+++ b/Application/RSBot/Views/Controls/Character.Designer.cs
@@ -41,9 +41,9 @@ private void InitializeComponent()
this.label9 = new System.Windows.Forms.Label();
this.lblInt = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
- this.progressEXP = new Theme.Controls.XpProgressBar();
- this.progressMP = new Theme.Controls.XpProgressBar();
- this.progressHP = new Theme.Controls.XpProgressBar();
+ this.progressEXP = new System.Windows.Forms.ProgressBar();
+ this.progressMP = new System.Windows.Forms.ProgressBar();
+ this.progressHP = new System.Windows.Forms.ProgressBar();
this.SuspendLayout();
//
// label2
@@ -158,49 +158,34 @@ private void InitializeComponent()
//
// progressEXP
//
- this.progressEXP.ColorBackGround = System.Drawing.Color.Gainsboro;
- this.progressEXP.ColorBarBorder = System.Drawing.Color.Green;
- this.progressEXP.ColorBarCenter = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
- this.progressEXP.ColorText = System.Drawing.Color.White;
this.progressEXP.Location = new System.Drawing.Point(10, 50);
this.progressEXP.Name = "progressEXP";
- this.progressEXP.Position = 0;
- this.progressEXP.PositionMax = 100;
- this.progressEXP.PositionMin = 0;
+ this.progressEXP.Value = 0;
+ this.progressEXP.Maximum = 100;
+ this.progressEXP.Minimum = 0;
this.progressEXP.Size = new System.Drawing.Size(402, 19);
- this.progressEXP.SteepDistance = ((byte)(0));
this.progressEXP.TabIndex = 2;
this.progressEXP.Text = "0%";
//
// progressMP
//
- this.progressMP.ColorBackGround = System.Drawing.Color.Gainsboro;
- this.progressMP.ColorBarBorder = System.Drawing.Color.DarkBlue;
- this.progressMP.ColorBarCenter = System.Drawing.Color.Blue;
- this.progressMP.ColorText = System.Drawing.Color.White;
this.progressMP.Location = new System.Drawing.Point(214, 28);
this.progressMP.Name = "progressMP";
- this.progressMP.Position = 0;
- this.progressMP.PositionMax = 100;
- this.progressMP.PositionMin = 0;
+ this.progressMP.Value = 0;
+ this.progressMP.Maximum = 100;
+ this.progressMP.Minimum = 0;
this.progressMP.Size = new System.Drawing.Size(198, 19);
- this.progressMP.SteepDistance = ((byte)(0));
this.progressMP.TabIndex = 1;
this.progressMP.Text = "0 / 0";
//
// progressHP
//
- this.progressHP.ColorBackGround = System.Drawing.Color.Gainsboro;
- this.progressHP.ColorBarBorder = System.Drawing.Color.DarkRed;
- this.progressHP.ColorBarCenter = System.Drawing.Color.Red;
- this.progressHP.ColorText = System.Drawing.Color.White;
this.progressHP.Location = new System.Drawing.Point(10, 28);
this.progressHP.Name = "progressHP";
- this.progressHP.Position = 0;
- this.progressHP.PositionMax = 100;
- this.progressHP.PositionMin = 0;
+ this.progressHP.Value = 0;
+ this.progressHP.Maximum = 100;
+ this.progressHP.Minimum = 0;
this.progressHP.Size = new System.Drawing.Size(198, 19);
- this.progressHP.SteepDistance = ((byte)(0));
this.progressHP.TabIndex = 0;
this.progressHP.Text = "0 / 0";
//
@@ -231,9 +216,9 @@ private void InitializeComponent()
#endregion
- private Theme.Controls.XpProgressBar progressHP;
- private Theme.Controls.XpProgressBar progressMP;
- private Theme.Controls.XpProgressBar progressEXP;
+ private System.Windows.Forms.ProgressBar progressHP;
+ private System.Windows.Forms.ProgressBar progressMP;
+ private System.Windows.Forms.ProgressBar progressEXP;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
diff --git a/Application/RSBot/Views/Controls/Character.cs b/Application/RSBot/Views/Controls/Character.cs
index a51b0d70..6e96d4a2 100644
--- a/Application/RSBot/Views/Controls/Character.cs
+++ b/Application/RSBot/Views/Controls/Character.cs
@@ -26,7 +26,7 @@ private void SubscribeEvents()
EventManager.SubscribeEvent("OnLoadCharacterStats", OnLoadCharacterStats);
EventManager.SubscribeEvent("OnLevelUp", OnLevelUp);
EventManager.SubscribeEvent("OnExpSpUpdate", OnExpUpdate);
- EventManager.SubscribeEvent("OnUpdateHPMP", OnHPMPUpdate);
+ EventManager.SubscribeEvent("OnUpdateHPMP", OnLoadCharacterStats);
EventManager.SubscribeEvent("OnUpdateGold", OnUpdateGold);
EventManager.SubscribeEvent("OnUpdateSP", OnUpdateSP);
EventManager.SubscribeEvent("OnAgentServerDisconnected", OnAgentServerDisconnected);
@@ -45,10 +45,28 @@ private void OnUpdateGold()
///
/// On Hp/MP update
///
- private void OnHPMPUpdate()
+ private void OnLoadCharacterStats()
{
- progressHP.Position = (int)Game.Player.Health;
- progressMP.Position = (int)Game.Player.Mana;
+ lblInt.Text = Game.Player.Intelligence.ToString();
+ lblStr.Text = Game.Player.Strength.ToString();
+
+ if (Game.Player.MaximumHealth == 0)
+ return;
+
+ if (Game.Player.MaximumMana == 0)
+ return;
+
+ progressHP.Maximum = Game.Player.MaximumHealth;
+ progressMP.Maximum = Game.Player.MaximumMana;
+
+ if(Game.Player.Health > Game.Player.MaximumHealth)
+ progressHP.Maximum = Game.Player.Health;
+
+ if (Game.Player.Mana > Game.Player.MaximumMana)
+ progressMP.Maximum = Game.Player.Mana;
+
+ progressHP.Value = Game.Player.Health;
+ progressMP.Value = Game.Player.Mana;
progressHP.Text = Game.Player.Health + @"/" + Game.Player.MaximumHealth;
progressMP.Text = Game.Player.Mana + @"/" + Game.Player.MaximumMana;
@@ -60,29 +78,10 @@ private void OnHPMPUpdate()
///
private void OnExpUpdate()
{
- var percentageExp = ((double)Game.Player.Experience / (double)Game.ReferenceManager.GetRefLevel(Game.Player.Level).Exp_C) * 100;
- progressEXP.Position = Convert.ToInt32(percentageExp);
- progressEXP.Text = Math.Round(percentageExp, 2) + @"%";
- }
+ var percentageExp = (Game.Player.Experience * 100.0) / Game.ReferenceManager.GetRefLevel(Game.Player.Level).Exp_C;
- ///
- /// s the on load character stats.
- ///
- private void OnLoadCharacterStats()
- {
- lblInt.Text = Game.Player.Intelligence.ToString();
- lblStr.Text = Game.Player.Strength.ToString();
-
- progressHP.PositionMax = (int)Game.Player.MaximumHealth;
- progressMP.PositionMax = (int)Game.Player.MaximumMana;
-
- progressHP.Position = (int)Game.Player.Health;
- progressMP.Position = (int)Game.Player.Mana;
-
- progressEXP.PositionMax = 100;
-
- progressHP.Text = Game.Player.Health + @"/" + Game.Player.MaximumHealth;
- progressMP.Text = Game.Player.Mana + @"/" + Game.Player.MaximumMana;
+ progressEXP.Value = Convert.ToInt32(percentageExp);
+ progressEXP.Text = Math.Round(percentageExp, 2) + @"%";
}
///
@@ -101,7 +100,7 @@ private void OnLoadCharacter()
lblPlayerName.Text = Game.Player.Name;
lblLevel.Text = Game.Player.Level.ToString();
- OnHPMPUpdate();
+ OnLoadCharacterStats();
OnExpUpdate();
OnUpdateSP();
OnUpdateGold();
@@ -118,11 +117,11 @@ private void OnAgentServerDisconnected()
lblInt.Text = "0";
lblGold.Text = "0";
lblSP.Text = "0";
- progressHP.Position = 0;
+ progressHP.Value = 0;
progressHP.Text = "0 / 0";
- progressMP.Position = 0;
+ progressMP.Value = 0;
progressMP.Text = "0 / 0";
- progressEXP.Position = 0;
+ progressEXP.Value = 0;
progressEXP.Text = "%0";
}
}
diff --git a/Application/RSBot/Views/Controls/Entity.Designer.cs b/Application/RSBot/Views/Controls/Entity.Designer.cs
index 320ce944..48778068 100644
--- a/Application/RSBot/Views/Controls/Entity.Designer.cs
+++ b/Application/RSBot/Views/Controls/Entity.Designer.cs
@@ -31,7 +31,7 @@ private void InitializeComponent()
this.label1 = new System.Windows.Forms.Label();
this.lblEntityName = new System.Windows.Forms.Label();
this.lblType = new System.Windows.Forms.Label();
- this.progressHP = new Theme.Controls.XpProgressBar();
+ this.progressHP = new System.Windows.Forms.ProgressBar();
this.SuspendLayout();
//
// label1
@@ -63,17 +63,12 @@ private void InitializeComponent()
//
// progressHP
//
- this.progressHP.ColorBackGround = System.Drawing.Color.Gainsboro;
- this.progressHP.ColorBarBorder = System.Drawing.Color.DarkRed;
- this.progressHP.ColorBarCenter = System.Drawing.Color.Red;
- this.progressHP.ColorText = System.Drawing.Color.White;
this.progressHP.Location = new System.Drawing.Point(52, 35);
this.progressHP.Name = "progressHP";
- this.progressHP.Position = 0;
- this.progressHP.PositionMax = 100;
- this.progressHP.PositionMin = 0;
+ this.progressHP.Value = 0;
+ this.progressHP.Maximum = 100;
+ this.progressHP.Minimum = 0;
this.progressHP.Size = new System.Drawing.Size(180, 19);
- this.progressHP.SteepDistance = ((byte)(0));
this.progressHP.TabIndex = 15;
this.progressHP.Text = "0%";
//
@@ -96,7 +91,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label lblEntityName;
- private Theme.Controls.XpProgressBar progressHP;
+ private System.Windows.Forms.ProgressBar progressHP;
private System.Windows.Forms.Label lblType;
}
}
diff --git a/Application/RSBot/Views/Controls/Entity.cs b/Application/RSBot/Views/Controls/Entity.cs
index 99b902a3..bc058d3f 100644
--- a/Application/RSBot/Views/Controls/Entity.cs
+++ b/Application/RSBot/Views/Controls/Entity.cs
@@ -47,7 +47,10 @@ private void OnSelectEntity(SpawnedBionic entity)
lblType.Text = monster.Rarity.GetName();
}
- progressHP.Position = percent;
+ if (percent > 100)
+ percent = 100;
+
+ progressHP.Value = percent;
progressHP.Text = percent + "%";
}
@@ -58,15 +61,18 @@ private void OnUpdateSelectedEntityHP(SpawnedBionic entity)
{
if (!entity.HasHealth)
{
- progressHP.Position = 100;
+ progressHP.Value = 100;
return;
}
if (entity is SpawnedMonster monster)
{
var percent = (monster.Health * 100) / monster.MaxHealth;
+ if (percent > 100)
+ percent = 100;
- progressHP.Position = percent;
+ progressHP.Maximum = monster.MaxHealth;
+ progressHP.Value = percent;
progressHP.Text = percent + "%";
}
}
@@ -101,7 +107,7 @@ private void OnAgentServerDisconnected()
private void Clear()
{
lblEntityName.Text = "No entity selected";
- progressHP.Position = 0;
+ progressHP.Value = 0;
progressHP.Text ="0%";
lblType.Text = "";
}
diff --git a/Application/RSBot/Views/Controls/Pet.Designer.cs b/Application/RSBot/Views/Controls/Pet.Designer.cs
index 044809a6..016ec946 100644
--- a/Application/RSBot/Views/Controls/Pet.Designer.cs
+++ b/Application/RSBot/Views/Controls/Pet.Designer.cs
@@ -32,9 +32,9 @@ private void InitializeComponent()
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.progressEXP = new Theme.Controls.XpProgressBar();
- this.progressHGP = new Theme.Controls.XpProgressBar();
- this.progressHP = new Theme.Controls.XpProgressBar();
+ this.progressEXP = new System.Windows.Forms.ProgressBar();
+ this.progressHGP = new System.Windows.Forms.ProgressBar();
+ this.progressHP = new System.Windows.Forms.ProgressBar();
this.SuspendLayout();
//
// lblPetName
@@ -76,49 +76,34 @@ private void InitializeComponent()
//
// progressEXP
//
- this.progressEXP.ColorBackGround = System.Drawing.Color.Gainsboro;
- this.progressEXP.ColorBarBorder = System.Drawing.Color.Green;
- this.progressEXP.ColorBarCenter = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
- this.progressEXP.ColorText = System.Drawing.Color.White;
this.progressEXP.Location = new System.Drawing.Point(51, 76);
this.progressEXP.Name = "progressEXP";
- this.progressEXP.Position = 0;
- this.progressEXP.PositionMax = 100;
- this.progressEXP.PositionMin = 0;
+ this.progressEXP.Value = 0;
+ this.progressEXP.Maximum = 100;
+ this.progressEXP.Minimum = 0;
this.progressEXP.Size = new System.Drawing.Size(180, 19);
- this.progressEXP.SteepDistance = ((byte)(0));
this.progressEXP.TabIndex = 12;
this.progressEXP.Text = "0%";
//
// progressHGP
//
- this.progressHGP.ColorBackGround = System.Drawing.Color.Gainsboro;
- this.progressHGP.ColorBarBorder = System.Drawing.Color.Gold;
- this.progressHGP.ColorBarCenter = System.Drawing.Color.Yellow;
- this.progressHGP.ColorText = System.Drawing.Color.White;
this.progressHGP.Location = new System.Drawing.Point(51, 55);
this.progressHGP.Name = "progressHGP";
- this.progressHGP.Position = 0;
- this.progressHGP.PositionMax = 100;
- this.progressHGP.PositionMin = 0;
+ this.progressHGP.Value = 0;
+ this.progressHGP.Maximum = 100;
+ this.progressHGP.Minimum = 0;
this.progressHGP.Size = new System.Drawing.Size(180, 19);
- this.progressHGP.SteepDistance = ((byte)(0));
this.progressHGP.TabIndex = 11;
this.progressHGP.Text = "0%";
//
// progressHP
//
- this.progressHP.ColorBackGround = System.Drawing.Color.Gainsboro;
- this.progressHP.ColorBarBorder = System.Drawing.Color.DarkRed;
- this.progressHP.ColorBarCenter = System.Drawing.Color.Red;
- this.progressHP.ColorText = System.Drawing.Color.White;
this.progressHP.Location = new System.Drawing.Point(51, 34);
this.progressHP.Name = "progressHP";
- this.progressHP.Position = 0;
- this.progressHP.PositionMax = 100;
- this.progressHP.PositionMin = 0;
+ this.progressHP.Value = 0;
+ this.progressHP.Maximum = 100;
+ this.progressHP.Minimum = 0;
this.progressHP.Size = new System.Drawing.Size(180, 19);
- this.progressHP.SteepDistance = ((byte)(0));
this.progressHP.TabIndex = 10;
this.progressHP.Text = "0%";
//
@@ -143,9 +128,9 @@ private void InitializeComponent()
#endregion
private System.Windows.Forms.Label lblPetName;
- private Theme.Controls.XpProgressBar progressEXP;
- private Theme.Controls.XpProgressBar progressHGP;
- private Theme.Controls.XpProgressBar progressHP;
+ private System.Windows.Forms.ProgressBar progressEXP;
+ private System.Windows.Forms.ProgressBar progressHGP;
+ private System.Windows.Forms.ProgressBar progressHP;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
diff --git a/Application/RSBot/Views/Controls/Pet.cs b/Application/RSBot/Views/Controls/Pet.cs
index 5017f031..80de5d96 100644
--- a/Application/RSBot/Views/Controls/Pet.cs
+++ b/Application/RSBot/Views/Controls/Pet.cs
@@ -39,9 +39,9 @@ private void SubscribeEvents()
private void OnTerminateAttackPet()
{
lblPetName.Text = @"No pet found";
- progressHP.Position = 0;
- progressEXP.Position = 0;
- progressHGP.Position = 0;
+ progressHP.Value = 0;
+ progressEXP.Value = 0;
+ progressHGP.Value = 0;
progressHP.Text = @"0%";
progressEXP.Text = @"0%";
progressHGP.Text = @"0%";
@@ -77,8 +77,11 @@ private void OnPetHealthUpdate()
{
if (Game.Player.AttackPet == null) return;
- var hpPercent = Math.Round((double)Game.Player.AttackPet.Health / (double)Game.Player.AttackPet.MaxHealth * 100, 0);
- progressHP.Position = Convert.ToInt32(hpPercent);
+ var hpPercent = (Game.Player.AttackPet.Health * 100) / Game.Player.AttackPet.MaxHealth;
+ if(hpPercent > 100)
+ hpPercent = 100;
+
+ progressHP.Value = Convert.ToInt32(hpPercent);
progressHP.Text = hpPercent + @"%";
}
@@ -87,9 +90,14 @@ private void OnPetHealthUpdate()
///
private void OnPetExpSpUpdate()
{
- if (Game.Player.AttackPet == null) return;
- var expPercent = Math.Round((double)Game.Player.AttackPet.Experience / (double)Game.Player.AttackPet.MaxExperience * 100, 0);
- progressEXP.Position = Convert.ToInt32(expPercent);
+ if (Game.Player.AttackPet == null)
+ return;
+
+ var expPercent = (Game.Player.AttackPet.Experience * 100) / Game.Player.AttackPet.MaxExperience;
+ if(expPercent > 100)
+ expPercent = 100;
+
+ progressEXP.Value = Convert.ToInt32(expPercent);
progressEXP.Text = expPercent + @"%";
}
@@ -98,9 +106,14 @@ private void OnPetExpSpUpdate()
///
private void OnAttackPetHungerUpdate()
{
- if (Game.Player.AttackPet == null) return;
- var hgpPercent = Math.Round((double)Game.Player.AttackPet.CurrentHungerPoints / (double)Game.Player.AttackPet.MaxHungerPoints * 100, 0);
- progressHGP.Position = Convert.ToInt32(hgpPercent);
+ if (Game.Player.AttackPet == null)
+ return;
+
+ var hgpPercent = (Game.Player.AttackPet.CurrentHungerPoints * 100) / Game.Player.AttackPet.MaxHungerPoints;
+ if(hgpPercent > 100)
+ hgpPercent = 100;
+
+ progressHGP.Value = Convert.ToInt32(hgpPercent);
progressHGP.Text = hgpPercent + @"%";
}
@@ -120,9 +133,9 @@ private void OnSummonAttackPet()
private void OnAgentServerDisconnected()
{
lblPetName.Text = "No pet found";
- foreach (XpProgressBar item in Controls.OfType())
+ foreach (ProgressBar item in Controls.OfType())
{
- item.Position = 0;
+ item.Value = 0;
item.Text = "0%";
}
}
diff --git a/Application/RSBot/Views/ExitDialog.Designer.cs b/Application/RSBot/Views/ExitDialog.Designer.cs
index a96e634f..42d9c342 100644
--- a/Application/RSBot/Views/ExitDialog.Designer.cs
+++ b/Application/RSBot/Views/ExitDialog.Designer.cs
@@ -30,8 +30,8 @@ private void InitializeComponent()
{
this.label1 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
- this.btnNo = new RSBot.Theme.Material.Button();
- this.btnYes = new RSBot.Theme.Material.Button();
+ this.btnNo = new System.Windows.Forms.Button();
+ this.btnYes = new System.Windows.Forms.Button();
this.checkDontAskAgain = new System.Windows.Forms.CheckBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel1.SuspendLayout();
@@ -62,15 +62,9 @@ private void InitializeComponent()
//
// btnNo
//
- this.btnNo.Depth = 0;
this.btnNo.DialogResult = System.Windows.Forms.DialogResult.No;
- this.btnNo.Icon = null;
this.btnNo.Location = new System.Drawing.Point(349, 14);
- this.btnNo.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnNo.Name = "btnNo";
- this.btnNo.Primary = false;
- this.btnNo.Raised = false;
- this.btnNo.SingleColor = System.Drawing.Color.Empty;
this.btnNo.Size = new System.Drawing.Size(75, 23);
this.btnNo.TabIndex = 1;
this.btnNo.Text = "No";
@@ -79,15 +73,9 @@ private void InitializeComponent()
// btnYes
//
this.btnYes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.btnYes.Depth = 0;
this.btnYes.DialogResult = System.Windows.Forms.DialogResult.Yes;
- this.btnYes.Icon = null;
this.btnYes.Location = new System.Drawing.Point(268, 14);
- this.btnYes.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnYes.Name = "btnYes";
- this.btnYes.Primary = true;
- this.btnYes.Raised = true;
- this.btnYes.SingleColor = System.Drawing.Color.Empty;
this.btnYes.Size = new System.Drawing.Size(75, 23);
this.btnYes.TabIndex = 0;
this.btnYes.Text = "Yes";
@@ -146,8 +134,8 @@ private void InitializeComponent()
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.PictureBox pictureBox1;
- private Theme.Material.Button btnNo;
- private Theme.Material.Button btnYes;
+ private System.Windows.Forms.Button btnNo;
+ private System.Windows.Forms.Button btnYes;
private System.Windows.Forms.CheckBox checkDontAskAgain;
}
}
\ No newline at end of file
diff --git a/Application/RSBot/Views/Main.Designer.cs b/Application/RSBot/Views/Main.Designer.cs
index da94c561..447ea541 100644
--- a/Application/RSBot/Views/Main.Designer.cs
+++ b/Application/RSBot/Views/Main.Designer.cs
@@ -32,15 +32,6 @@ private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
- this.menuMain = new System.Windows.Forms.MainMenu(this.components);
- this.menuItem1 = new System.Windows.Forms.MenuItem();
- this.topmenuItemExit = new System.Windows.Forms.MenuItem();
- this.menuItem2 = new System.Windows.Forms.MenuItem();
- this.menuSidebar = new System.Windows.Forms.MenuItem();
- this.menuItem4 = new System.Windows.Forms.MenuItem();
- this.menuScriptRecorder = new System.Windows.Forms.MenuItem();
- this.menuPlugins = new System.Windows.Forms.MenuItem();
- this.menuItem3 = new System.Windows.Forms.MenuItem();
this.stripStatus = new System.Windows.Forms.StatusStrip();
this.menuBotbase = new System.Windows.Forms.ToolStripDropDownButton();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
@@ -49,11 +40,8 @@ private void InitializeComponent()
this.panel1 = new System.Windows.Forms.Panel();
this.comboServer = new System.Windows.Forms.ComboBox();
this.comboDivision = new System.Windows.Forms.ComboBox();
- this.btnSave = new RSBot.Theme.Material.Button();
- this.btnStartStop = new RSBot.Theme.Material.Button();
- this.panel7 = new System.Windows.Forms.Panel();
- this.tabMain = new System.Windows.Forms.TabControl();
- this.panel2 = new System.Windows.Forms.Panel();
+ this.btnSave = new System.Windows.Forms.Button();
+ this.btnStartStop = new System.Windows.Forms.Button();
this.pSidebar = new System.Windows.Forms.Panel();
this.picLogo = new System.Windows.Forms.PictureBox();
this.entity1 = new RSBot.Views.Controls.Entity();
@@ -62,80 +50,27 @@ private void InitializeComponent()
this.linkHideSidebar = new System.Windows.Forms.LinkLabel();
this.botbase1ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.botbase1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.centerPanel = new System.Windows.Forms.Panel();
- this.panel3 = new System.Windows.Forms.Panel();
this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
+ this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.menuItemExit = new System.Windows.Forms.ToolStripMenuItem();
+ this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.menuSidebar = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.menuScriptRecorder = new System.Windows.Forms.ToolStripMenuItem();
+ this.menuPlugins = new System.Windows.Forms.ToolStripMenuItem();
+ this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.thisToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.topCharacter = new RSBot.Views.Controls.Character();
- this.menuItemThis = new System.Windows.Forms.MenuItem();
+ this.menuStrip = new System.Windows.Forms.MenuStrip();
+ this.tabMain = new System.Windows.Forms.TabControl();
this.stripStatus.SuspendLayout();
this.panel1.SuspendLayout();
this.pSidebar.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picLogo)).BeginInit();
this.panel8.SuspendLayout();
- this.centerPanel.SuspendLayout();
+ this.menuStrip.SuspendLayout();
this.SuspendLayout();
//
- // menuMain
- //
- this.menuMain.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
- this.menuItem1,
- this.menuItem2,
- this.menuItem4,
- this.menuPlugins,
- this.menuItem3});
- //
- // menuItem1
- //
- this.menuItem1.Index = 0;
- this.menuItem1.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
- this.topmenuItemExit});
- this.menuItem1.Text = "File";
- //
- // topmenuItemExit
- //
- this.topmenuItemExit.Index = 0;
- this.topmenuItemExit.Text = "Exit";
- this.topmenuItemExit.Click += new System.EventHandler(this.menuItemExit_Click);
- //
- // menuItem2
- //
- this.menuItem2.Index = 1;
- this.menuItem2.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
- this.menuSidebar});
- this.menuItem2.Text = "View";
- //
- // menuSidebar
- //
- this.menuSidebar.Checked = true;
- this.menuSidebar.Index = 0;
- this.menuSidebar.Text = "Sidebar";
- this.menuSidebar.Click += new System.EventHandler(this.menuSidebar_Click);
- //
- // menuItem4
- //
- this.menuItem4.Index = 2;
- this.menuItem4.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
- this.menuScriptRecorder});
- this.menuItem4.Text = "Tools";
- //
- // menuScriptRecorder
- //
- this.menuScriptRecorder.Index = 0;
- this.menuScriptRecorder.Text = "Script Recorder";
- this.menuScriptRecorder.Click += new System.EventHandler(this.menuScriptRecorder_Click);
- //
- // menuPlugins
- //
- this.menuPlugins.Index = 3;
- this.menuPlugins.Text = "Plugins";
- //
- // menuItem3
- //
- this.menuItem3.Index = 4;
- this.menuItem3.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
- this.menuItemThis});
- this.menuItem3.Text = "About";
- //
// stripStatus
//
this.stripStatus.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(150)))), ((int)(((byte)(243)))));
@@ -147,7 +82,7 @@ private void InitializeComponent()
this.lblIngameStatus,
this.toolStripStatusLabelBeta});
this.stripStatus.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
- this.stripStatus.Location = new System.Drawing.Point(0, 578);
+ this.stripStatus.Location = new System.Drawing.Point(0, 593);
this.stripStatus.Name = "stripStatus";
this.stripStatus.Size = new System.Drawing.Size(1032, 23);
this.stripStatus.SizingGrip = false;
@@ -190,14 +125,13 @@ private void InitializeComponent()
//
// panel1
//
- this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
+ this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.comboServer);
this.panel1.Controls.Add(this.comboDivision);
this.panel1.Controls.Add(this.btnSave);
this.panel1.Controls.Add(this.btnStartStop);
- this.panel1.Controls.Add(this.panel7);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, 526);
+ this.panel1.Location = new System.Drawing.Point(0, 541);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1032, 52);
this.panel1.TabIndex = 2;
@@ -208,7 +142,7 @@ private void InitializeComponent()
this.comboServer.FormattingEnabled = true;
this.comboServer.Location = new System.Drawing.Point(109, 18);
this.comboServer.Name = "comboServer";
- this.comboServer.Size = new System.Drawing.Size(132, 21);
+ this.comboServer.Size = new System.Drawing.Size(132, 23);
this.comboServer.TabIndex = 11;
this.comboServer.SelectedIndexChanged += new System.EventHandler(this.comboServer_SelectedIndexChanged);
//
@@ -218,7 +152,7 @@ private void InitializeComponent()
this.comboDivision.FormattingEnabled = true;
this.comboDivision.Location = new System.Drawing.Point(12, 18);
this.comboDivision.Name = "comboDivision";
- this.comboDivision.Size = new System.Drawing.Size(91, 21);
+ this.comboDivision.Size = new System.Drawing.Size(91, 23);
this.comboDivision.TabIndex = 10;
this.comboDivision.SelectedIndexChanged += new System.EventHandler(this.comboDivision_SelectedIndexChanged);
//
@@ -227,14 +161,8 @@ private void InitializeComponent()
this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.btnSave.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(76)))), ((int)(((byte)(175)))), ((int)(((byte)(80)))));
- this.btnSave.Depth = 0;
- this.btnSave.Icon = null;
this.btnSave.Location = new System.Drawing.Point(824, 16);
- this.btnSave.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnSave.Name = "btnSave";
- this.btnSave.Primary = false;
- this.btnSave.Raised = false;
- this.btnSave.SingleColor = System.Drawing.Color.Empty;
this.btnSave.Size = new System.Drawing.Size(95, 23);
this.btnSave.TabIndex = 1;
this.btnSave.TabStop = false;
@@ -246,15 +174,9 @@ private void InitializeComponent()
//
this.btnStartStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnStartStop.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.btnStartStop.Depth = 0;
this.btnStartStop.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
- this.btnStartStop.Icon = null;
this.btnStartStop.Location = new System.Drawing.Point(925, 16);
- this.btnStartStop.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnStartStop.Name = "btnStartStop";
- this.btnStartStop.Primary = true;
- this.btnStartStop.Raised = true;
- this.btnStartStop.SingleColor = System.Drawing.Color.Empty;
this.btnStartStop.Size = new System.Drawing.Size(95, 23);
this.btnStartStop.TabIndex = 0;
this.btnStartStop.TabStop = false;
@@ -262,45 +184,17 @@ private void InitializeComponent()
this.btnStartStop.UseVisualStyleBackColor = false;
this.btnStartStop.Click += new System.EventHandler(this.btnStartStop_Click);
//
- // panel7
- //
- this.panel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
- this.panel7.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel7.Location = new System.Drawing.Point(0, 0);
- this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(1032, 2);
- this.panel7.TabIndex = 7;
- //
- // tabMain
- //
- this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMain.ItemSize = new System.Drawing.Size(0, 23);
- this.tabMain.Location = new System.Drawing.Point(6, 3);
- this.tabMain.Name = "tabMain";
- this.tabMain.SelectedIndex = 0;
- this.tabMain.Size = new System.Drawing.Size(773, 437);
- this.tabMain.TabIndex = 3;
- //
- // panel2
- //
- this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
- this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel2.Location = new System.Drawing.Point(0, 81);
- this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1032, 2);
- this.panel2.TabIndex = 4;
- //
// pSidebar
//
- this.pSidebar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
+ this.pSidebar.BackColor = System.Drawing.Color.Transparent;
this.pSidebar.Controls.Add(this.picLogo);
this.pSidebar.Controls.Add(this.entity1);
this.pSidebar.Controls.Add(this.pet1);
this.pSidebar.Controls.Add(this.panel8);
this.pSidebar.Dock = System.Windows.Forms.DockStyle.Right;
- this.pSidebar.Location = new System.Drawing.Point(782, 83);
+ this.pSidebar.Location = new System.Drawing.Point(782, 0);
this.pSidebar.Name = "pSidebar";
- this.pSidebar.Size = new System.Drawing.Size(250, 443);
+ this.pSidebar.Size = new System.Drawing.Size(250, 541);
this.pSidebar.TabIndex = 6;
//
// picLogo
@@ -308,7 +202,7 @@ private void InitializeComponent()
this.picLogo.Cursor = System.Windows.Forms.Cursors.Hand;
this.picLogo.Dock = System.Windows.Forms.DockStyle.Bottom;
this.picLogo.Image = ((System.Drawing.Image)(resources.GetObject("picLogo.Image")));
- this.picLogo.Location = new System.Drawing.Point(0, 349);
+ this.picLogo.Location = new System.Drawing.Point(0, 447);
this.picLogo.Name = "picLogo";
this.picLogo.Size = new System.Drawing.Size(250, 94);
this.picLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -346,9 +240,11 @@ private void InitializeComponent()
// linkHideSidebar
//
this.linkHideSidebar.AutoSize = true;
+ this.linkHideSidebar.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.linkHideSidebar.LinkColor = System.Drawing.Color.Blue;
this.linkHideSidebar.Location = new System.Drawing.Point(169, 2);
this.linkHideSidebar.Name = "linkHideSidebar";
- this.linkHideSidebar.Size = new System.Drawing.Size(72, 13);
+ this.linkHideSidebar.Size = new System.Drawing.Size(73, 15);
this.linkHideSidebar.TabIndex = 0;
this.linkHideSidebar.TabStop = true;
this.linkHideSidebar.Text = "Hide sidebar";
@@ -366,26 +262,6 @@ private void InitializeComponent()
this.botbase1ToolStripMenuItem.Size = new System.Drawing.Size(132, 22);
this.botbase1ToolStripMenuItem.Text = "Botbase #1";
//
- // centerPanel
- //
- this.centerPanel.Controls.Add(this.tabMain);
- this.centerPanel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.centerPanel.Location = new System.Drawing.Point(0, 83);
- this.centerPanel.Name = "centerPanel";
- this.centerPanel.Padding = new System.Windows.Forms.Padding(6, 3, 3, 3);
- this.centerPanel.Size = new System.Drawing.Size(782, 443);
- this.centerPanel.TabIndex = 9;
- //
- // panel3
- //
- this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
- this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(1032, 2);
- this.panel3.TabIndex = 10;
- this.panel3.Visible = false;
- //
// notifyIcon
//
this.notifyIcon.BalloonTipIcon = System.Windows.Forms.ToolTipIcon.Info;
@@ -396,41 +272,125 @@ private void InitializeComponent()
this.notifyIcon.Visible = true;
this.notifyIcon.Click += new System.EventHandler(this.notifyIcon_Click);
//
+ // fileToolStripMenuItem
+ //
+ this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.menuItemExit});
+ this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+ this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+ this.fileToolStripMenuItem.Text = "File";
+ //
+ // menuItemExit
+ //
+ this.menuItemExit.Name = "menuItemExit";
+ this.menuItemExit.Size = new System.Drawing.Size(93, 22);
+ this.menuItemExit.Text = "Exit";
+ this.menuItemExit.Click += new System.EventHandler(this.menuItemExit_Click);
+ //
+ // viewToolStripMenuItem
+ //
+ this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.menuSidebar});
+ this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
+ this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20);
+ this.viewToolStripMenuItem.Text = "View";
+ //
+ // menuSidebar
+ //
+ this.menuSidebar.Name = "menuSidebar";
+ this.menuSidebar.Size = new System.Drawing.Size(113, 22);
+ this.menuSidebar.Text = "Sidebar";
+ this.menuSidebar.Click += new System.EventHandler(this.menuSidebar_Click);
+ //
+ // toolsToolStripMenuItem
+ //
+ this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.menuScriptRecorder});
+ this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
+ this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
+ this.toolsToolStripMenuItem.Text = "Tools";
+ //
+ // menuScriptRecorder
+ //
+ this.menuScriptRecorder.Name = "menuScriptRecorder";
+ this.menuScriptRecorder.Size = new System.Drawing.Size(154, 22);
+ this.menuScriptRecorder.Text = "Script Recorder";
+ this.menuScriptRecorder.Click += new System.EventHandler(this.menuScriptRecorder_Click);
+ //
+ // menuPlugins
+ //
+ this.menuPlugins.Name = "menuPlugins";
+ this.menuPlugins.Size = new System.Drawing.Size(58, 20);
+ this.menuPlugins.Text = "Plugins";
+ //
+ // aboutToolStripMenuItem
+ //
+ this.aboutToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.thisToolStripMenuItem});
+ this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+ this.aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20);
+ this.aboutToolStripMenuItem.Text = "About";
+ //
+ // thisToolStripMenuItem
+ //
+ this.thisToolStripMenuItem.Name = "thisToolStripMenuItem";
+ this.thisToolStripMenuItem.Size = new System.Drawing.Size(95, 22);
+ this.thisToolStripMenuItem.Text = "This";
+ this.thisToolStripMenuItem.Click += new System.EventHandler(this.menuItemThis_Click);
+ //
// topCharacter
//
+ this.topCharacter.BackColor = System.Drawing.Color.White;
this.topCharacter.Dock = System.Windows.Forms.DockStyle.Top;
- this.topCharacter.Location = new System.Drawing.Point(0, 2);
+ this.topCharacter.Location = new System.Drawing.Point(0, 24);
this.topCharacter.Margin = new System.Windows.Forms.Padding(4);
this.topCharacter.Name = "topCharacter";
- this.topCharacter.Size = new System.Drawing.Size(1032, 79);
+ this.topCharacter.Size = new System.Drawing.Size(782, 79);
this.topCharacter.TabIndex = 7;
//
- // menuItemThis
+ // menuStrip
+ //
+ this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.fileToolStripMenuItem,
+ this.viewToolStripMenuItem,
+ this.toolsToolStripMenuItem,
+ this.menuPlugins,
+ this.aboutToolStripMenuItem});
+ this.menuStrip.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip.Name = "menuStrip";
+ this.menuStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+ this.menuStrip.Size = new System.Drawing.Size(782, 24);
+ this.menuStrip.TabIndex = 10;
+ this.menuStrip.Text = "menuStrip1";
+ //
+ // tabMain
//
- this.menuItemThis.Index = 0;
- this.menuItemThis.Text = "This";
- this.menuItemThis.Click += new System.EventHandler(this.menuItemThis_Click);
+ this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMain.ItemSize = new System.Drawing.Size(0, 23);
+ this.tabMain.Location = new System.Drawing.Point(0, 103);
+ this.tabMain.Name = "tabMain";
+ this.tabMain.SelectedIndex = 0;
+ this.tabMain.Size = new System.Drawing.Size(782, 438);
+ this.tabMain.TabIndex = 3;
//
// Main
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.White;
- this.ClientSize = new System.Drawing.Size(1032, 601);
- this.Controls.Add(this.centerPanel);
- this.Controls.Add(this.pSidebar);
- this.Controls.Add(this.panel2);
+ this.ClientSize = new System.Drawing.Size(1032, 616);
+ this.Controls.Add(this.tabMain);
this.Controls.Add(this.topCharacter);
+ this.Controls.Add(this.menuStrip);
+ this.Controls.Add(this.pSidebar);
this.Controls.Add(this.panel1);
this.Controls.Add(this.stripStatus);
- this.Controls.Add(this.panel3);
- this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+ this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MaximizeBox = false;
+ this.MainMenuStrip = this.menuStrip;
this.MaximumSize = new System.Drawing.Size(1048, 724);
- this.Menu = this.menuMain;
this.Name = "Main";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "RSBot";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
this.Load += new System.EventHandler(this.Main_Load);
@@ -443,49 +403,45 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.picLogo)).EndInit();
this.panel8.ResumeLayout(false);
this.panel8.PerformLayout();
- this.centerPanel.ResumeLayout(false);
+ this.menuStrip.ResumeLayout(false);
+ this.menuStrip.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
-
- private System.Windows.Forms.MainMenu menuMain;
- private System.Windows.Forms.MenuItem menuItem1;
- private System.Windows.Forms.MenuItem menuItem2;
- private System.Windows.Forms.MenuItem menuItem3;
private System.Windows.Forms.StatusStrip stripStatus;
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.TabControl tabMain;
- private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel pSidebar;
private System.Windows.Forms.ToolStripStatusLabel lblIngameStatus;
- private Theme.Material.Button btnStartStop;
- private Theme.Material.Button btnSave;
+ private System.Windows.Forms.Button btnStartStop;
+ private System.Windows.Forms.Button btnSave;
private Controls.Character topCharacter;
private Controls.Pet pet1;
- private System.Windows.Forms.Panel panel7;
private System.Windows.Forms.Panel panel8;
private System.Windows.Forms.LinkLabel linkHideSidebar;
private Entity entity1;
- private System.Windows.Forms.MenuItem menuSidebar;
private System.Windows.Forms.ComboBox comboServer;
private System.Windows.Forms.ComboBox comboDivision;
private System.Windows.Forms.ToolStripDropDownButton menuBotbase;
private System.Windows.Forms.ToolStripMenuItem botbase1ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem botbase1ToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
- private System.Windows.Forms.MenuItem menuItem4;
- private System.Windows.Forms.MenuItem menuScriptRecorder;
private System.Windows.Forms.PictureBox picLogo;
- private System.Windows.Forms.MenuItem menuPlugins;
- private System.Windows.Forms.Panel centerPanel;
- private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelBeta;
private System.Windows.Forms.NotifyIcon notifyIcon;
- private System.Windows.Forms.MenuItem topmenuItemExit;
- private System.Windows.Forms.MenuItem menuItemThis;
+ private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem menuItemExit;
+ private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem menuSidebar;
+ private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem menuScriptRecorder;
+ private System.Windows.Forms.ToolStripMenuItem menuPlugins;
+ private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem thisToolStripMenuItem;
+ private System.Windows.Forms.MenuStrip menuStrip;
+ private System.Windows.Forms.TabControl tabMain;
}
}
diff --git a/Application/RSBot/Views/Main.cs b/Application/RSBot/Views/Main.cs
index d5a9dafa..ce2a3641 100644
--- a/Application/RSBot/Views/Main.cs
+++ b/Application/RSBot/Views/Main.cs
@@ -3,6 +3,7 @@
using RSBot.Core.Components;
using RSBot.Core.Event;
using RSBot.Core.Plugins;
+using RSBot.Theme.Controls;
using System;
using System.Diagnostics;
using System.Drawing;
@@ -67,7 +68,8 @@ private void SelectBotbase(int index)
Name = "tabBotbase",
Enabled = false
};
-
+ tabPage.BackColor = Color.FromArgb(200, BackColor);
+ tabPage.ForeColor = ForeColor;
tabPage.Controls.Add(selectedBotbase.GetView());
tabMain.TabPages.Insert(1, tabPage);
@@ -75,7 +77,7 @@ private void SelectBotbase(int index)
Kernel.Bot.SetBotbase(selectedBotbase);
GlobalConfig.Set("RSBot.BotIndex", index.ToString());
- var info = new Theme.Controls.TabDisabledInfo { Name = "overlay", Location = new Point(tabMain.Width / 2 - 110, tabMain.Height - 150) };
+ var info = new TabDisabledInfo { Name = "overlay", Location = new Point(tabMain.Width / 2 - 110, tabMain.Height - 150) };
tabPage.Controls.Add(info);
//So we can see it at least..
@@ -106,6 +108,9 @@ private void LoadExtensions()
var control = extension.Value.GetView();
control.Dock = DockStyle.Fill;
+
+ tabPage.BackColor = Color.FromArgb(200, BackColor);
+ tabPage.ForeColor = ForeColor;
tabPage.Controls.Add(control);
tabMain.TabPages.Add(tabPage);
@@ -127,14 +132,14 @@ private void LoadExtensions()
foreach (var extension in tempExtensions.Where(extension => !extension.Value.Information.DisplayAsTab))
{
- var menuItem = new MenuItem(extension.Value.Information.DisplayName)
+ var menuItem = new ToolStripMenuItem(extension.Value.Information.DisplayName)
{
Enabled = !extension.Value.Information.RequireIngame
};
menuItem.Click += PluginMenuItem_Click;
menuItem.Tag = extension.Value;
- menuPlugins.MenuItems.Add(menuItem);
+ menuPlugins.DropDownItems.Add(menuItem);
}
}
@@ -452,7 +457,7 @@ private void OnLoadCharacter()
tabPage.Controls["overlay"]?.Hide();
}
- foreach (MenuItem item in menuPlugins.MenuItems)
+ foreach (MenuItem item in menuPlugins.DropDownItems)
item.Enabled = true;
Text = $@"RSBot - {Game.Player.Name}";
diff --git a/Application/RSBot/Views/Main.resx b/Application/RSBot/Views/Main.resx
index 346a7a45..0423f64e 100644
--- a/Application/RSBot/Views/Main.resx
+++ b/Application/RSBot/Views/Main.resx
@@ -117,9 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
127, 17
@@ -1455,6 +1452,9 @@
//////////////////////////////////8=
+
+ 31, 17
+
127
diff --git a/Application/RSBot/Views/ScriptRecorder.Designer.cs b/Application/RSBot/Views/ScriptRecorder.Designer.cs
index 269d3c03..f0ecc3eb 100644
--- a/Application/RSBot/Views/ScriptRecorder.Designer.cs
+++ b/Application/RSBot/Views/ScriptRecorder.Designer.cs
@@ -30,10 +30,10 @@ private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ScriptRecorder));
this.panel1 = new System.Windows.Forms.Panel();
- this.btnRunNow = new Theme.Material.Button();
- this.btnSave = new Theme.Material.Button();
- this.btnClear = new Theme.Material.Button();
- this.btnStart = new Theme.Material.Button();
+ this.btnRunNow = new System.Windows.Forms.Button();
+ this.btnSave = new System.Windows.Forms.Button();
+ this.btnClear = new System.Windows.Forms.Button();
+ this.btnStart = new System.Windows.Forms.Button();
this.txtScript = new System.Windows.Forms.RichTextBox();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.lblStatus = new System.Windows.Forms.ToolStripStatusLabel();
@@ -55,13 +55,8 @@ private void InitializeComponent()
//
// btnRunNow
//
- this.btnRunNow.Depth = 0;
- this.btnRunNow.Icon = null;
this.btnRunNow.Location = new System.Drawing.Point(174, 9);
- this.btnRunNow.MouseState = Theme.IMatMouseState.HOVER;
this.btnRunNow.Name = "btnRunNow";
- this.btnRunNow.Primary = false;
- this.btnRunNow.Raised = false;
this.btnRunNow.Size = new System.Drawing.Size(75, 23);
this.btnRunNow.TabIndex = 3;
this.btnRunNow.Text = "Run now";
@@ -71,13 +66,8 @@ private void InitializeComponent()
// btnSave
//
this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnSave.Depth = 0;
- this.btnSave.Icon = null;
this.btnSave.Location = new System.Drawing.Point(464, 9);
- this.btnSave.MouseState = Theme.IMatMouseState.HOVER;
this.btnSave.Name = "btnSave";
- this.btnSave.Primary = true;
- this.btnSave.Raised = true;
this.btnSave.Size = new System.Drawing.Size(75, 23);
this.btnSave.TabIndex = 0;
this.btnSave.Text = "Save";
@@ -86,13 +76,8 @@ private void InitializeComponent()
//
// btnClear
//
- this.btnClear.Depth = 0;
- this.btnClear.Icon = null;
this.btnClear.Location = new System.Drawing.Point(93, 9);
- this.btnClear.MouseState = Theme.IMatMouseState.HOVER;
this.btnClear.Name = "btnClear";
- this.btnClear.Primary = false;
- this.btnClear.Raised = false;
this.btnClear.Size = new System.Drawing.Size(75, 23);
this.btnClear.TabIndex = 0;
this.btnClear.Text = "Clear";
@@ -101,13 +86,8 @@ private void InitializeComponent()
//
// btnStart
//
- this.btnStart.Depth = 0;
- this.btnStart.Icon = null;
this.btnStart.Location = new System.Drawing.Point(12, 9);
- this.btnStart.MouseState = Theme.IMatMouseState.HOVER;
this.btnStart.Name = "btnStart";
- this.btnStart.Primary = false;
- this.btnStart.Raised = false;
this.btnStart.Size = new System.Drawing.Size(75, 23);
this.btnStart.TabIndex = 0;
this.btnStart.Text = "Start";
@@ -167,11 +147,11 @@ private void InitializeComponent()
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.RichTextBox txtScript;
- private Theme.Material.Button btnStart;
- private Theme.Material.Button btnSave;
+ private System.Windows.Forms.Button btnStart;
+ private System.Windows.Forms.Button btnSave;
private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel lblStatus;
- private Theme.Material.Button btnClear;
- private Theme.Material.Button btnRunNow;
+ private System.Windows.Forms.Button btnClear;
+ private System.Windows.Forms.Button btnRunNow;
}
}
\ No newline at end of file
diff --git a/Application/RSBot/Views/SplashScreen.cs b/Application/RSBot/Views/SplashScreen.cs
index 07c1fa40..6200353d 100644
--- a/Application/RSBot/Views/SplashScreen.cs
+++ b/Application/RSBot/Views/SplashScreen.cs
@@ -6,7 +6,7 @@
namespace RSBot.Views
{
- public partial class SplashScreen : CleanForm
+ public partial class SplashScreen : Form
{
private readonly Main _mainForm;
diff --git a/Application/RSBot/Views/Updater.Designer.cs b/Application/RSBot/Views/Updater.Designer.cs
index 69c57bfc..64f7066b 100644
--- a/Application/RSBot/Views/Updater.Designer.cs
+++ b/Application/RSBot/Views/Updater.Designer.cs
@@ -32,8 +32,8 @@ private void InitializeComponent()
this.lblInfo = new System.Windows.Forms.Label();
this.cbChangeLog = new System.Windows.Forms.CheckBox();
this.label2 = new System.Windows.Forms.Label();
- this.btnDownload = new RSBot.Theme.Material.Button();
- this.btnSkip = new RSBot.Theme.Material.Button();
+ this.btnDownload = new System.Windows.Forms.Button();
+ this.btnSkip = new System.Windows.Forms.Button();
this.centerPanel = new System.Windows.Forms.Panel();
this.downloadProgress = new System.Windows.Forms.ProgressBar();
this.lblDownloadInfo = new System.Windows.Forms.Label();
@@ -90,15 +90,9 @@ private void InitializeComponent()
this.btnDownload.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.btnDownload.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.btnDownload.Depth = 0;
this.btnDownload.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnDownload.Icon = null;
this.btnDownload.Location = new System.Drawing.Point(332, 5);
- this.btnDownload.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnDownload.Name = "btnDownload";
- this.btnDownload.Primary = true;
- this.btnDownload.Raised = true;
- this.btnDownload.SingleColor = System.Drawing.Color.Empty;
this.btnDownload.Size = new System.Drawing.Size(85, 23);
this.btnDownload.TabIndex = 4;
this.btnDownload.Text = "Update";
@@ -107,15 +101,9 @@ private void InitializeComponent()
//
// btnSkip
//
- this.btnSkip.Depth = 0;
this.btnSkip.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnSkip.Icon = null;
this.btnSkip.Location = new System.Drawing.Point(5, 5);
- this.btnSkip.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnSkip.Name = "btnSkip";
- this.btnSkip.Primary = false;
- this.btnSkip.Raised = false;
- this.btnSkip.SingleColor = System.Drawing.Color.Empty;
this.btnSkip.Size = new System.Drawing.Size(75, 23);
this.btnSkip.TabIndex = 4;
this.btnSkip.Text = "Skip";
@@ -190,8 +178,8 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblInfo;
private System.Windows.Forms.CheckBox cbChangeLog;
private System.Windows.Forms.Label label2;
- private Theme.Material.Button btnDownload;
- private Theme.Material.Button btnSkip;
+ private System.Windows.Forms.Button btnDownload;
+ private System.Windows.Forms.Button btnSkip;
private System.Windows.Forms.Panel centerPanel;
private System.Windows.Forms.ProgressBar downloadProgress;
private System.Windows.Forms.Label lblDownloadInfo;
diff --git a/Application/RSBot/Views/Updater.cs b/Application/RSBot/Views/Updater.cs
index 4e8f7605..b0e2eba4 100644
--- a/Application/RSBot/Views/Updater.cs
+++ b/Application/RSBot/Views/Updater.cs
@@ -1,4 +1,5 @@
-using System;
+using RSBot.Theme.Extensions;
+using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
@@ -10,8 +11,6 @@
namespace RSBot.Views
{
- using Theme.Extensions;
-
public partial class Updater : Form
{
public Updater()
diff --git a/Botbases/RSBot.Bot.Default/Bundle/Attack/AttackBundle.cs b/Botbases/RSBot.Bot.Default/Bundle/Attack/AttackBundle.cs
index 819c260e..d3a78e83 100644
--- a/Botbases/RSBot.Bot.Default/Bundle/Attack/AttackBundle.cs
+++ b/Botbases/RSBot.Bot.Default/Bundle/Attack/AttackBundle.cs
@@ -35,7 +35,9 @@ public void Invoke()
if (Game.Player.InAction && SkillManager.LastActionType != ActionType.AutoAttack)
return;
+ var stopwatch = System.Diagnostics.Stopwatch.StartNew();
var skill = SkillManager.GetNextSkill();
+ Log.Debug($"Getnextskill: {stopwatch.ElapsedMilliseconds} Action:{Game.Player.InAction} Entity:{Game.SelectedEntity != null} LA:{SkillManager.LastActionType} Skill:{skill}");
if (skill == null)
{
if (Game.Player.InAction)
diff --git a/Botbases/RSBot.Bot.Default/RSBot.Bot.Default.csproj b/Botbases/RSBot.Bot.Default/RSBot.Bot.Default.csproj
index 2428f440..657b1609 100644
--- a/Botbases/RSBot.Bot.Default/RSBot.Bot.Default.csproj
+++ b/Botbases/RSBot.Bot.Default/RSBot.Bot.Default.csproj
@@ -77,11 +77,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Botbases/RSBot.Bot.Default/Views/Main.Designer.cs b/Botbases/RSBot.Bot.Default/Views/Main.Designer.cs
index adf60f9e..eed17031 100644
--- a/Botbases/RSBot.Bot.Default/Views/Main.Designer.cs
+++ b/Botbases/RSBot.Bot.Default/Views/Main.Designer.cs
@@ -46,7 +46,7 @@ private void InitializeComponent()
this.label5 = new System.Windows.Forms.Label();
this.radioWalkAround = new System.Windows.Forms.RadioButton();
this.radioCenter = new System.Windows.Forms.RadioButton();
- this.btnGetCurrent = new RSBot.Theme.Material.Button();
+ this.btnGetCurrent = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
@@ -54,7 +54,7 @@ private void InitializeComponent()
this.txtYCoord = new System.Windows.Forms.TextBox();
this.txtXCoord = new System.Windows.Forms.TextBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.lvAvoidance = new RSBot.Theme.Controls.ListView();
+ this.lvAvoidance = new System.Windows.Forms.ListView();
this.ctxAvoidance = new System.Windows.Forms.ContextMenuStrip(this.components);
this.btnAvoid = new System.Windows.Forms.ToolStripMenuItem();
this.btnPrefer = new System.Windows.Forms.ToolStripMenuItem();
@@ -64,7 +64,7 @@ private void InitializeComponent()
this.checkUseSpeedDrug = new System.Windows.Forms.CheckBox();
this.checkCastBuffs = new System.Windows.Forms.CheckBox();
this.checkUseMount = new System.Windows.Forms.CheckBox();
- this.btnBrowse = new RSBot.Theme.Material.Button();
+ this.btnBrowse = new System.Windows.Forms.Button();
this.txtWalkscript = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.checkBerzerkWhenFull = new System.Windows.Forms.CheckBox();
@@ -145,14 +145,8 @@ private void InitializeComponent()
//
// btnGetCurrent
//
- this.btnGetCurrent.Depth = 0;
- this.btnGetCurrent.Icon = null;
this.btnGetCurrent.Location = new System.Drawing.Point(107, 106);
- this.btnGetCurrent.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnGetCurrent.Name = "btnGetCurrent";
- this.btnGetCurrent.Primary = false;
- this.btnGetCurrent.Raised = false;
- this.btnGetCurrent.SingleColor = System.Drawing.Color.Empty;
this.btnGetCurrent.Size = new System.Drawing.Size(97, 23);
this.btnGetCurrent.TabIndex = 3;
this.btnGetCurrent.Text = "Current";
@@ -349,14 +343,8 @@ private void InitializeComponent()
//
// btnBrowse
//
- this.btnBrowse.Depth = 0;
- this.btnBrowse.Icon = null;
this.btnBrowse.Location = new System.Drawing.Point(406, 46);
- this.btnBrowse.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnBrowse.Name = "btnBrowse";
- this.btnBrowse.Primary = false;
- this.btnBrowse.Raised = false;
- this.btnBrowse.SingleColor = System.Drawing.Color.Empty;
this.btnBrowse.Size = new System.Drawing.Size(57, 21);
this.btnBrowse.TabIndex = 3;
this.btnBrowse.Text = "Browse";
@@ -494,9 +482,9 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox txtXCoord;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.GroupBox groupBox2;
- private Theme.Material.Button btnGetCurrent;
+ private System.Windows.Forms.Button btnGetCurrent;
private System.Windows.Forms.GroupBox groupBox3;
- private Theme.Material.Button btnBrowse;
+ private System.Windows.Forms.Button btnBrowse;
private System.Windows.Forms.TextBox txtWalkscript;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.CheckBox checkUseMount;
@@ -507,7 +495,7 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox checkUseSpeedDrug;
private System.Windows.Forms.CheckBox checkCastBuffs;
private System.Windows.Forms.CheckBox checkBerzerkWhenFull;
- private Theme.Controls.ListView lvAvoidance;
+ private System.Windows.Forms.ListView lvAvoidance;
private System.Windows.Forms.ContextMenuStrip ctxAvoidance;
private System.Windows.Forms.ToolStripMenuItem btnAvoid;
private System.Windows.Forms.ToolStripMenuItem btnPrefer;
diff --git a/Library/RSBot.Core/Components/SkillManager.cs b/Library/RSBot.Core/Components/SkillManager.cs
index 6e7af85e..d0452ce7 100644
--- a/Library/RSBot.Core/Components/SkillManager.cs
+++ b/Library/RSBot.Core/Components/SkillManager.cs
@@ -5,6 +5,7 @@
using RSBot.Core.Objects.Spawn;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
using System.Threading;
@@ -92,6 +93,9 @@ public static void SetSkills(MonsterRarity monsterRarity, List skills
public static SkillInfo GetNextSkill()
{
var entity = Game.SelectedEntity;
+ if (entity == null)
+ return null;
+
var rarity = MonsterRarity.General;
if (entity is SpawnedMonster monster)
@@ -113,6 +117,7 @@ public static SkillInfo GetNextSkill()
}
else if (distance < 10)
{
+ var stopwatch = Stopwatch.StartNew();
while (Skills[rarity].Count > 0)
{
_lastIndex++;
@@ -126,6 +131,8 @@ public static SkillInfo GetNextSkill()
closestSkill = selectedSkill;
break;
}
+
+ //Debug.WriteLine($"while loop: {stopwatch.ElapsedMilliseconds}");
}
else
{
@@ -133,6 +140,9 @@ public static SkillInfo GetNextSkill()
if (weapon != null)
weaponRange = weapon.Record.Range / 10;
*/
+
+ var stopwatch = Stopwatch.StartNew();
+
for (int i = 0; i < Skills[rarity].Count; i++)
{
var s = Skills[rarity][i];
@@ -146,6 +156,7 @@ public static SkillInfo GetNextSkill()
closestSkill = s;
}
}
+ //Debug.WriteLine($"for loop: {stopwatch.ElapsedMilliseconds}");
}
return closestSkill;
diff --git a/Library/RSBot.Core/Network/Handler/Agent/Character/CharacterUpdateStatsResponse.cs b/Library/RSBot.Core/Network/Handler/Agent/Character/CharacterUpdateStatsResponse.cs
index 31aa3a16..6fc805e2 100644
--- a/Library/RSBot.Core/Network/Handler/Agent/Character/CharacterUpdateStatsResponse.cs
+++ b/Library/RSBot.Core/Network/Handler/Agent/Character/CharacterUpdateStatsResponse.cs
@@ -37,12 +37,12 @@ public void Invoke(Packet packet)
Core.Game.Player.HitRate = packet.ReadUShort();
Core.Game.Player.ParryRate = packet.ReadUShort();
- Core.Game.Player.MaximumHealth = packet.ReadUInt();
- Core.Game.Player.MaximumMana = packet.ReadUInt();
+ Core.Game.Player.MaximumHealth = packet.ReadInt();
+ Core.Game.Player.MaximumMana = packet.ReadInt();
Core.Game.Player.Strength = packet.ReadUShort();
Core.Game.Player.Intelligence = packet.ReadUShort();
-
+
EventManager.FireEvent("OnLoadCharacterStats");
}
}
diff --git a/Library/RSBot.Core/Network/Handler/Agent/Cos/CosUpdateResponse.cs b/Library/RSBot.Core/Network/Handler/Agent/Cos/CosUpdateResponse.cs
index 13853e23..a74a7363 100644
--- a/Library/RSBot.Core/Network/Handler/Agent/Cos/CosUpdateResponse.cs
+++ b/Library/RSBot.Core/Network/Handler/Agent/Cos/CosUpdateResponse.cs
@@ -43,7 +43,7 @@ public void Invoke(Packet packet)
break;
case 3:
- var experience = packet.ReadULong();
+ var experience = packet.ReadLong();
var source = packet.ReadUInt();
if (source == Core.Game.Player.AttackPet.UniqueId || Core.Game.Player.AttackPet == null) return;
@@ -51,9 +51,9 @@ public void Invoke(Packet packet)
Core.Game.Player.AttackPet.Experience += experience;
var iLevel = Core.Game.Player.AttackPet.Level;
- while (Core.Game.Player.AttackPet.Experience > (ulong)Core.Game.ReferenceManager.GetRefLevel(iLevel).Exp_C)
+ while (Core.Game.Player.AttackPet.Experience > Core.Game.ReferenceManager.GetRefLevel(iLevel).Exp_C)
{
- Core.Game.Player.AttackPet.Experience -= (ulong)Core.Game.ReferenceManager.GetRefLevel(iLevel).Exp_C;
+ Core.Game.Player.AttackPet.Experience -= Core.Game.ReferenceManager.GetRefLevel(iLevel).Exp_C;
iLevel++;
}
diff --git a/Library/RSBot.Core/Objects/Cos/AttackPet.cs b/Library/RSBot.Core/Objects/Cos/AttackPet.cs
index ca1aad69..c944b02f 100644
--- a/Library/RSBot.Core/Objects/Cos/AttackPet.cs
+++ b/Library/RSBot.Core/Objects/Cos/AttackPet.cs
@@ -23,7 +23,7 @@ public AttackPet(uint objId) : base(objId) {}
///
/// The experience.
///
- public ulong Experience { get; set; }
+ public long Experience { get; set; }
///
/// Gets or sets the level.
@@ -105,7 +105,7 @@ internal static AttackPet FromPacket(Packet packet, uint uniqueId, uint id)
var maxHealth = packet.ReadInt(); //UNKNOWN
result.MaxHealth = maxHealth != 0 ? maxHealth : result.Health;
- result.Experience = packet.ReadULong();
+ result.Experience = packet.ReadLong();
result.Level = packet.ReadByte();
result.CurrentHungerPoints = packet.ReadUShort();
packet.ReadInt(); //UNKNOWN (maybe control?)
diff --git a/Library/RSBot.Core/Objects/Player.cs b/Library/RSBot.Core/Objects/Player.cs
index 85c48041..f155308b 100644
--- a/Library/RSBot.Core/Objects/Player.cs
+++ b/Library/RSBot.Core/Objects/Player.cs
@@ -258,7 +258,7 @@ public class Player : SpawnedBionic
///
/// The maximum health.
///
- public uint MaximumHealth { get; set; }
+ public int MaximumHealth { get; set; }
///
/// Gets or sets the maximum mana.
@@ -266,7 +266,7 @@ public class Player : SpawnedBionic
///
/// The maximum mana.
///
- public uint MaximumMana { get; set; }
+ public int MaximumMana { get; set; }
///
/// Gets or sets the strength.
@@ -650,7 +650,7 @@ private bool UsePotion(TypeIdFilter filter, ref int tick, ref int duration)
}
}
var elapsed = Environment.TickCount - tick;
- Log.Notify($"{potionItem.Record.GetRealName()} {tick} {elapsed} {duration} {elapsed < duration}");
+ Log.Debug($"{potionItem.Record.GetRealName()} {tick} {elapsed} {duration} {elapsed < duration}");
if (elapsed < duration)
return false;
diff --git a/Library/RSBot.Core/RSBot.Core.csproj b/Library/RSBot.Core/RSBot.Core.csproj
index d91a5a86..7c38e776 100644
--- a/Library/RSBot.Core/RSBot.Core.csproj
+++ b/Library/RSBot.Core/RSBot.Core.csproj
@@ -42,8 +42,10 @@
+
+
@@ -291,6 +293,19 @@
+
+ Form
+
+
+ InputDialog.cs
+
+
+ UserControl
+
+
+
+
+
diff --git a/Library/RSBot.Theme/Controls/InputDialog.Designer.cs b/Library/RSBot.Core/Temp.Theme/Controls/InputDialog.Designer.cs
similarity index 90%
rename from Library/RSBot.Theme/Controls/InputDialog.Designer.cs
rename to Library/RSBot.Core/Temp.Theme/Controls/InputDialog.Designer.cs
index c897eaae..fdbbfce9 100644
--- a/Library/RSBot.Theme/Controls/InputDialog.Designer.cs
+++ b/Library/RSBot.Core/Temp.Theme/Controls/InputDialog.Designer.cs
@@ -32,8 +32,8 @@ private void InitializeComponent()
this.lblMessage = new System.Windows.Forms.Label();
this.txtValue = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
- this.btnOK = new RSBot.Theme.Material.Button();
- this.btnCancel = new RSBot.Theme.Material.Button();
+ this.btnOK = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
this.comboBox = new System.Windows.Forms.ComboBox();
this.numValue = new System.Windows.Forms.NumericUpDown();
this.panel1.SuspendLayout();
@@ -80,15 +80,9 @@ private void InitializeComponent()
//
// btnOK
//
- this.btnOK.Depth = 0;
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.btnOK.Icon = null;
this.btnOK.Location = new System.Drawing.Point(158, 4);
- this.btnOK.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnOK.Name = "btnOK";
- this.btnOK.Primary = true;
- this.btnOK.Raised = true;
- this.btnOK.SingleColor = System.Drawing.Color.Empty;
this.btnOK.Size = new System.Drawing.Size(75, 23);
this.btnOK.TabIndex = 0;
this.btnOK.Text = "OK";
@@ -97,15 +91,9 @@ private void InitializeComponent()
//
// btnCancel
//
- this.btnCancel.Depth = 0;
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Icon = null;
this.btnCancel.Location = new System.Drawing.Point(239, 4);
- this.btnCancel.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Primary = false;
- this.btnCancel.Raised = false;
- this.btnCancel.SingleColor = System.Drawing.Color.Empty;
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 1;
this.btnCancel.Text = "Cancel";
@@ -178,8 +166,8 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblMessage;
private System.Windows.Forms.TextBox txtValue;
private System.Windows.Forms.Panel panel1;
- private Theme.Material.Button btnOK;
- private Theme.Material.Button btnCancel;
+ private System.Windows.Forms.Button btnOK;
+ private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.ComboBox comboBox;
private System.Windows.Forms.NumericUpDown numValue;
}
diff --git a/Library/RSBot.Theme/Controls/InputDialog.cs b/Library/RSBot.Core/Temp.Theme/Controls/InputDialog.cs
similarity index 96%
rename from Library/RSBot.Theme/Controls/InputDialog.cs
rename to Library/RSBot.Core/Temp.Theme/Controls/InputDialog.cs
index 157042c6..e0a8e167 100644
--- a/Library/RSBot.Theme/Controls/InputDialog.cs
+++ b/Library/RSBot.Core/Temp.Theme/Controls/InputDialog.cs
@@ -3,7 +3,7 @@
namespace RSBot.Theme.Controls
{
- public partial class InputDialog : CleanForm
+ public partial class InputDialog : Form
{
public enum InputType
{
@@ -109,7 +109,7 @@ private void btnOK_Click(object sender, EventArgs e)
break;
}
- if(_inputType == InputType.Textbox && string.IsNullOrWhiteSpace(value.ToString()))
+ if (_inputType == InputType.Textbox && string.IsNullOrWhiteSpace(value.ToString()))
{
MessageBox.Show(this, "The value can't be empty!");
@@ -152,7 +152,7 @@ private void InputDialog_FormClosing(object sender, FormClosingEventArgs e)
/// The instance containing the event data.
private void numValue_KeyUp(object sender, KeyEventArgs e)
{
- if (e.KeyCode != Keys.Enter)
+ if (e.KeyCode != Keys.Enter)
return;
Value = numValue.Value;
diff --git a/Library/RSBot.Theme/Controls/TabDisabledInfo.cs b/Library/RSBot.Core/Temp.Theme/Controls/TabDisabledInfo.cs
similarity index 100%
rename from Library/RSBot.Theme/Controls/TabDisabledInfo.cs
rename to Library/RSBot.Core/Temp.Theme/Controls/TabDisabledInfo.cs
diff --git a/Library/RSBot.Theme/Extensions/ListViewExtensions.cs b/Library/RSBot.Core/Temp.Theme/Extensions/ListViewExtensions.cs
similarity index 100%
rename from Library/RSBot.Theme/Extensions/ListViewExtensions.cs
rename to Library/RSBot.Core/Temp.Theme/Extensions/ListViewExtensions.cs
diff --git a/Library/RSBot.Theme/Extensions/TextBoxBase.cs b/Library/RSBot.Core/Temp.Theme/Extensions/TextBoxBase.cs
similarity index 98%
rename from Library/RSBot.Theme/Extensions/TextBoxBase.cs
rename to Library/RSBot.Core/Temp.Theme/Extensions/TextBoxBase.cs
index ad7b17fe..af3268bb 100644
--- a/Library/RSBot.Theme/Extensions/TextBoxBase.cs
+++ b/Library/RSBot.Core/Temp.Theme/Extensions/TextBoxBase.cs
@@ -33,7 +33,7 @@ public static void Write(this TextBoxBase value, string str, bool time = true, b
value.ScrollToCaret();
});
- if(writeToFile)
+ if (writeToFile)
{
lock (_lock)
{
diff --git a/Library/RSBot.Theme/MoveDirection.cs b/Library/RSBot.Core/Temp.Theme/MoveDirection.cs
similarity index 65%
rename from Library/RSBot.Theme/MoveDirection.cs
rename to Library/RSBot.Core/Temp.Theme/MoveDirection.cs
index c8ccb0fc..49c1e1c1 100644
--- a/Library/RSBot.Theme/MoveDirection.cs
+++ b/Library/RSBot.Core/Temp.Theme/MoveDirection.cs
@@ -3,9 +3,9 @@
///
/// The moving direction
///
- public enum MoveDirection
- {
- Up = -1,
- Down = 1
+ public enum MoveDirection
+ {
+ Up = -1,
+ Down = 1
};
}
diff --git a/Library/RSBot.Theme/Controls/TabDisabledInfo.Designer.cs b/Library/RSBot.Core/Temp.Theme/TabDisabledInfo.Designer.cs
similarity index 100%
rename from Library/RSBot.Theme/Controls/TabDisabledInfo.Designer.cs
rename to Library/RSBot.Core/Temp.Theme/TabDisabledInfo.Designer.cs
diff --git a/Library/RSBot.Theme/Animation/AnimationDirection.cs b/Library/RSBot.Theme/Animation/AnimationDirection.cs
deleted file mode 100644
index c7f8b16d..00000000
--- a/Library/RSBot.Theme/Animation/AnimationDirection.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace RSBot.Theme.Animation
-{
- internal enum AnimationDirection
- {
- In, //In. Stops if finished.
- Out, //Out. Stops if finished.
- InOutIn, //Same as In, but changes to InOutOut if finished.
- InOutOut, //Same as Out.
- InOutRepeatingIn, // Same as In, but changes to InOutRepeatingOut if finished.
- InOutRepeatingOut // Same as Out, but changes to InOutRepeatingIn if finished.
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Animation/AnimationManager.cs b/Library/RSBot.Theme/Animation/AnimationManager.cs
deleted file mode 100644
index 9e021b25..00000000
--- a/Library/RSBot.Theme/Animation/AnimationManager.cs
+++ /dev/null
@@ -1,374 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace RSBot.Theme.Animation
-{
- internal class AnimationManager
- {
- public bool InterruptAnimation { get; set; }
- public double Increment { get; set; }
- public double SecondaryIncrement { get; set; }
- public AnimationType AnimationType { get; set; }
- public bool Singular { get; set; }
-
- public delegate void AnimationFinished(object sender);
-
- public event AnimationFinished OnAnimationFinished;
-
- public delegate void AnimationProgress(object sender);
-
- public event AnimationProgress OnAnimationProgress;
-
- private readonly List animationProgresses;
- private readonly List animationSources;
- private readonly List animationDirections;
- private readonly List animationDatas;
-
- private const double MIN_VALUE = 0.00;
- private const double MAX_VALUE = 1.00;
-
- private readonly Timer animationTimer = new Timer { Interval = 10, Enabled = false };
-
- ///
- /// Constructor
- ///
- /// If true, only one animation is supported. The current animation will be replaced with the new one. If false, a new animation is added to the list.
- public AnimationManager(bool singular = true)
- {
- animationProgresses = new List();
- animationSources = new List();
- animationDirections = new List();
- animationDatas = new List();
-
- Increment = 0.03;
- SecondaryIncrement = 0.03;
- AnimationType = AnimationType.Linear;
- InterruptAnimation = true;
- Singular = singular;
-
- if (Singular)
- {
- animationProgresses.Add(0);
- animationSources.Add(new Point(0, 0));
- animationDirections.Add(AnimationDirection.In);
- }
-
- animationTimer.Tick += AnimationTimerOnTick;
- }
-
- private void AnimationTimerOnTick(object sender, EventArgs eventArgs)
- {
- for (int i = 0; i < animationProgresses.Count; i++)
- {
- UpdateProgress(i);
-
- if (!Singular)
- {
- if ((animationDirections[i] == AnimationDirection.InOutIn && animationProgresses[i] == MAX_VALUE))
- {
- animationDirections[i] = AnimationDirection.InOutOut;
- }
- else if ((animationDirections[i] == AnimationDirection.InOutRepeatingIn && animationProgresses[i] == MIN_VALUE))
- {
- animationDirections[i] = AnimationDirection.InOutRepeatingOut;
- }
- else if ((animationDirections[i] == AnimationDirection.InOutRepeatingOut && animationProgresses[i] == MIN_VALUE))
- {
- animationDirections[i] = AnimationDirection.InOutRepeatingIn;
- }
- else if (
- (animationDirections[i] == AnimationDirection.In && animationProgresses[i] == MAX_VALUE) ||
- (animationDirections[i] == AnimationDirection.Out && animationProgresses[i] == MIN_VALUE) ||
- (animationDirections[i] == AnimationDirection.InOutOut && animationProgresses[i] == MIN_VALUE))
- {
- animationProgresses.RemoveAt(i);
- animationSources.RemoveAt(i);
- animationDirections.RemoveAt(i);
- animationDatas.RemoveAt(i);
- }
- }
- else
- {
- if ((animationDirections[i] == AnimationDirection.InOutIn && animationProgresses[i] == MAX_VALUE))
- {
- animationDirections[i] = AnimationDirection.InOutOut;
- }
- else if ((animationDirections[i] == AnimationDirection.InOutRepeatingIn && animationProgresses[i] == MAX_VALUE))
- {
- animationDirections[i] = AnimationDirection.InOutRepeatingOut;
- }
- else if ((animationDirections[i] == AnimationDirection.InOutRepeatingOut && animationProgresses[i] == MIN_VALUE))
- {
- animationDirections[i] = AnimationDirection.InOutRepeatingIn;
- }
- }
- }
-
- if (OnAnimationProgress != null)
- {
- OnAnimationProgress(this);
- }
- }
-
- public bool IsAnimating()
- {
- return animationTimer.Enabled;
- }
-
- public void StartNewAnimation(AnimationDirection animationDirection, object[] data = null)
- {
- StartNewAnimation(animationDirection, new Point(0, 0), data);
- }
-
- public void StartNewAnimation(AnimationDirection animationDirection, Point animationSource, object[] data = null)
- {
- if (!IsAnimating() || InterruptAnimation)
- {
- if (Singular && animationDirections.Count > 0)
- {
- animationDirections[0] = animationDirection;
- }
- else
- {
- animationDirections.Add(animationDirection);
- }
-
- if (Singular && animationSources.Count > 0)
- {
- animationSources[0] = animationSource;
- }
- else
- {
- animationSources.Add(animationSource);
- }
-
- if (!(Singular && animationProgresses.Count > 0))
- {
- switch (animationDirections[animationDirections.Count - 1])
- {
- case AnimationDirection.InOutRepeatingIn:
- case AnimationDirection.InOutIn:
- case AnimationDirection.In:
- animationProgresses.Add(MIN_VALUE);
- break;
-
- case AnimationDirection.InOutRepeatingOut:
- case AnimationDirection.InOutOut:
- case AnimationDirection.Out:
- animationProgresses.Add(MAX_VALUE);
- break;
-
- default:
- throw new Exception("Invalid AnimationDirection");
- }
- }
-
- if (Singular && animationDatas.Count > 0)
- {
- animationDatas[0] = data ?? new object[] { };
- }
- else
- {
- animationDatas.Add(data ?? new object[] { });
- }
- }
-
- animationTimer.Start();
- }
-
- public void UpdateProgress(int index)
- {
- switch (animationDirections[index])
- {
- case AnimationDirection.InOutRepeatingIn:
- case AnimationDirection.InOutIn:
- case AnimationDirection.In:
- IncrementProgress(index);
- break;
-
- case AnimationDirection.InOutRepeatingOut:
- case AnimationDirection.InOutOut:
- case AnimationDirection.Out:
- DecrementProgress(index);
- break;
-
- default:
- throw new Exception("No AnimationDirection has been set");
- }
- }
-
- private void IncrementProgress(int index)
- {
- animationProgresses[index] += Increment;
- if (animationProgresses[index] > MAX_VALUE)
- {
- animationProgresses[index] = MAX_VALUE;
-
- for (int i = 0; i < GetAnimationCount(); i++)
- {
- if (animationDirections[i] == AnimationDirection.InOutIn) return;
- if (animationDirections[i] == AnimationDirection.InOutRepeatingIn) return;
- if (animationDirections[i] == AnimationDirection.InOutRepeatingOut) return;
- if (animationDirections[i] == AnimationDirection.InOutOut && animationProgresses[i] != MAX_VALUE) return;
- if (animationDirections[i] == AnimationDirection.In && animationProgresses[i] != MAX_VALUE) return;
- }
-
- animationTimer.Stop();
- if (OnAnimationFinished != null) OnAnimationFinished(this);
- }
- }
-
- private void DecrementProgress(int index)
- {
- animationProgresses[index] -= (animationDirections[index] == AnimationDirection.InOutOut || animationDirections[index] == AnimationDirection.InOutRepeatingOut) ? SecondaryIncrement : Increment;
- if (animationProgresses[index] < MIN_VALUE)
- {
- animationProgresses[index] = MIN_VALUE;
-
- for (int i = 0; i < GetAnimationCount(); i++)
- {
- if (animationDirections[i] == AnimationDirection.InOutIn) return;
- if (animationDirections[i] == AnimationDirection.InOutRepeatingIn) return;
- if (animationDirections[i] == AnimationDirection.InOutRepeatingOut) return;
- if (animationDirections[i] == AnimationDirection.InOutOut && animationProgresses[i] != MIN_VALUE) return;
- if (animationDirections[i] == AnimationDirection.Out && animationProgresses[i] != MIN_VALUE) return;
- }
-
- animationTimer.Stop();
- if (OnAnimationFinished != null) OnAnimationFinished(this);
- }
- }
-
- public double GetProgress()
- {
- if (!Singular)
- throw new Exception("Animation is not set to Singular.");
-
- if (animationProgresses.Count == 0)
- throw new Exception("Invalid animation");
-
- return GetProgress(0);
- }
-
- public double GetProgress(int index)
- {
- if (!(index < GetAnimationCount()))
- throw new IndexOutOfRangeException("Invalid animation index");
-
- switch (AnimationType)
- {
- case AnimationType.Linear:
- return AnimationLinear.CalculateProgress(animationProgresses[index]);
-
- case AnimationType.EaseInOut:
- return AnimationEaseInOut.CalculateProgress(animationProgresses[index]);
-
- case AnimationType.EaseOut:
- return AnimationEaseOut.CalculateProgress(animationProgresses[index]);
-
- case AnimationType.CustomQuadratic:
- return AnimationCustomQuadratic.CalculateProgress(animationProgresses[index]);
-
- default:
- throw new NotImplementedException("The given AnimationType is not implemented");
- }
- }
-
- public Point GetSource(int index)
- {
- if (!(index < GetAnimationCount()))
- throw new IndexOutOfRangeException("Invalid animation index");
-
- return animationSources[index];
- }
-
- public Point GetSource()
- {
- if (!Singular)
- throw new Exception("Animation is not set to Singular.");
-
- if (animationSources.Count == 0)
- throw new Exception("Invalid animation");
-
- return animationSources[0];
- }
-
- public AnimationDirection GetDirection()
- {
- if (!Singular)
- throw new Exception("Animation is not set to Singular.");
-
- if (animationDirections.Count == 0)
- throw new Exception("Invalid animation");
-
- return animationDirections[0];
- }
-
- public AnimationDirection GetDirection(int index)
- {
- if (!(index < animationDirections.Count))
- throw new IndexOutOfRangeException("Invalid animation index");
-
- return animationDirections[index];
- }
-
- public object[] GetData()
- {
- if (!Singular)
- throw new Exception("Animation is not set to Singular.");
-
- if (animationDatas.Count == 0)
- throw new Exception("Invalid animation");
-
- return animationDatas[0];
- }
-
- public object[] GetData(int index)
- {
- if (!(index < animationDatas.Count))
- throw new IndexOutOfRangeException("Invalid animation index");
-
- return animationDatas[index];
- }
-
- public int GetAnimationCount()
- {
- return animationProgresses.Count;
- }
-
- public void SetProgress(double progress)
- {
- if (!Singular)
- throw new Exception("Animation is not set to Singular.");
-
- if (animationProgresses.Count == 0)
- throw new Exception("Invalid animation");
-
- animationProgresses[0] = progress;
- }
-
- public void SetDirection(AnimationDirection direction)
- {
- if (!Singular)
- throw new Exception("Animation is not set to Singular.");
-
- if (animationProgresses.Count == 0)
- throw new Exception("Invalid animation");
-
- animationDirections[0] = direction;
- }
-
- public void SetData(object[] data)
- {
- if (!Singular)
- throw new Exception("Animation is not set to Singular.");
-
- if (animationDatas.Count == 0)
- throw new Exception("Invalid animation");
-
- animationDatas[0] = data;
- }
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Animation/Animations.cs b/Library/RSBot.Theme/Animation/Animations.cs
deleted file mode 100644
index 4a046253..00000000
--- a/Library/RSBot.Theme/Animation/Animations.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-
-namespace RSBot.Theme.Animation
-{
- internal enum AnimationType
- {
- Linear,
- EaseInOut,
- EaseOut,
- CustomQuadratic
- }
-
- internal static class AnimationLinear
- {
- public static double CalculateProgress(double progress)
- {
- return progress;
- }
- }
-
- internal static class AnimationEaseInOut
- {
- public static double PI = Math.PI;
- public static double PI_HALF = Math.PI / 2;
-
- public static double CalculateProgress(double progress)
- {
- return EaseInOut(progress);
- }
-
- private static double EaseInOut(double s)
- {
- return s - Math.Sin(s * 2 * PI) / (2 * PI);
- }
- }
-
- public static class AnimationEaseOut
- {
- public static double CalculateProgress(double progress)
- {
- return -1 * progress * (progress - 2);
- }
- }
-
- public static class AnimationCustomQuadratic
- {
- public static double CalculateProgress(double progress)
- {
- double kickoff = 0.6;
- return 1 - Math.Cos((Math.Max(progress, kickoff) - kickoff) * Math.PI / (2 - (2 * kickoff)));
- }
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/ColorScheme.cs b/Library/RSBot.Theme/ColorScheme.cs
deleted file mode 100644
index 74c94857..00000000
--- a/Library/RSBot.Theme/ColorScheme.cs
+++ /dev/null
@@ -1,347 +0,0 @@
-using System.Drawing;
-
-namespace RSBot.Theme
-{
- public class ColorScheme
- {
- public static THEME Theme { get; set; } = THEME.LIGHT;
-
- // normal
- public static Color BackColorBegin => Theme == THEME.DARK ? Color.FromArgb(85, 85, 85) : Color.FromArgb(249, 249, 249);
-
- public static Color BackColorEnd => Theme == THEME.DARK ? Color.FromArgb(16, 16, 16) : Color.FromArgb(208, 208, 211);
-
- // hover
- public static Color BackColorHoverBegin => Theme == THEME.DARK ? Color.FromArgb(99, 99, 99) : Color.FromArgb(255, 255, 255);
-
- public static Color BackColorHoverEnd => Theme == THEME.DARK ? Color.FromArgb(23, 23, 23) : Color.FromArgb(212, 212, 220);
-
- public static Color ForeColor => Theme == THEME.DARK ? Color.FromArgb(255, 255, 255) : Color.FromArgb(22, 22, 22);
- public static Color ForeColorSelected => Theme == THEME.DARK ? Color.FromArgb(244, 244, 244) : Color.FromArgb(33, 33, 33);
- public static Color ForeColorDisabled => Theme == THEME.DARK ? Color.FromArgb(188, 188, 188) : Color.FromArgb(99, 99, 99);
-
- public static Color BackColor => Theme == THEME.DARK ? Color.FromArgb(21, 21, 21) : Color.FromArgb(249, 249, 249);
-
- public static Color BorderColor => Theme == THEME.DARK ? Color.FromArgb(66, 66, 66) : Color.FromArgb(194, 194, 194);
-
- public readonly Color PrimaryColor, DarkPrimaryColor, LightPrimaryColor, AccentColor, TextColor;
- public readonly Pen PrimaryPen, DarkPrimaryPen, LightPrimaryPen, AccentPen, TextPen;
- public readonly Brush PrimaryBrush, DarkPrimaryBrush, LightPrimaryBrush, AccentBrush, TextBrush;
-
- ///
- /// Defines the Color Scheme to be used for all forms.
- ///
- /// The primary color, a -500 color is suggested here.
- /// A darker version of the primary color, a -700 color is suggested here.
- /// A lighter version of the primary color, a -100 color is suggested here.
- /// The accent color, a -200 color is suggested here.
- /// The text color, the one with the highest contrast is suggested.
- public ColorScheme(Primary primary, Primary darkPrimary, Primary lightPrimary, Accent accent, TextShade textShade)
- {
- //Color
- PrimaryColor = ((int)primary).ToColor();
- DarkPrimaryColor = ((int)darkPrimary).ToColor();
- LightPrimaryColor = ((int)lightPrimary).ToColor();
- AccentColor = ((int)accent).ToColor();
- TextColor = ((int)textShade).ToColor();
-
- //Pen
- PrimaryPen = new Pen(PrimaryColor);
- DarkPrimaryPen = new Pen(DarkPrimaryColor);
- LightPrimaryPen = new Pen(LightPrimaryColor);
- AccentPen = new Pen(AccentColor);
- TextPen = new Pen(TextColor);
-
- //Brush
- PrimaryBrush = new SolidBrush(PrimaryColor);
- DarkPrimaryBrush = new SolidBrush(DarkPrimaryColor);
- LightPrimaryBrush = new SolidBrush(LightPrimaryColor);
- AccentBrush = new SolidBrush(AccentColor);
- TextBrush = new SolidBrush(TextColor);
- }
- }
-
- public enum THEME : byte
- {
- LIGHT,
- DARK
- }
-
- //Color constantes
- public enum TextShade
- {
- WHITE = 0xFFFFFF,
- BLACK = 0x212121
- }
-
- public enum Primary
- {
- DARK = 0x313233,
- DARK2 = 0x2d2d2d,
- Red50 = 0xFFEBEE,
- Red100 = 0xFFCDD2,
- Red200 = 0xEF9A9A,
- Red300 = 0xE57373,
- Red400 = 0xEF5350,
- Red500 = 0xF44336,
- Red600 = 0xE53935,
- Red700 = 0xD32F2F,
- Red800 = 0xC62828,
- Red900 = 0xB71C1C,
- Pink50 = 0xFCE4EC,
- Pink100 = 0xF8BBD0,
- Pink200 = 0xF48FB1,
- Pink300 = 0xF06292,
- Pink400 = 0xEC407A,
- Pink500 = 0xE91E63,
- Pink600 = 0xD81B60,
- Pink700 = 0xC2185B,
- Pink800 = 0xAD1457,
- Pink900 = 0x880E4F,
- Purple50 = 0xF3E5F5,
- Purple100 = 0xE1BEE7,
- Purple200 = 0xCE93D8,
- Purple300 = 0xBA68C8,
- Purple400 = 0xAB47BC,
- Purple500 = 0x9C27B0,
- Purple600 = 0x8E24AA,
- Purple700 = 0x7B1FA2,
- Purple800 = 0x6A1B9A,
- Purple900 = 0x4A148C,
- DeepPurple50 = 0xEDE7F6,
- DeepPurple100 = 0xD1C4E9,
- DeepPurple200 = 0xB39DDB,
- DeepPurple300 = 0x9575CD,
- DeepPurple400 = 0x7E57C2,
- DeepPurple500 = 0x673AB7,
- DeepPurple600 = 0x5E35B1,
- DeepPurple700 = 0x512DA8,
- DeepPurple800 = 0x4527A0,
- DeepPurple900 = 0x311B92,
- Indigo50 = 0xE8EAF6,
- Indigo100 = 0xC5CAE9,
- Indigo200 = 0x9FA8DA,
- Indigo300 = 0x7986CB,
- Indigo400 = 0x5C6BC0,
- Indigo500 = 0x3F51B5,
- Indigo600 = 0x3949AB,
- Indigo700 = 0x303F9F,
- Indigo800 = 0x283593,
- Indigo900 = 0x1A237E,
- Blue50 = 0xE3F2FD,
- Blue100 = 0xBBDEFB,
- Blue200 = 0x90CAF9,
- Blue300 = 0x64B5F6,
- Blue400 = 0x42A5F5,
- Blue500 = 0x2196F3,
- Blue600 = 0x1E88E5,
- Blue700 = 0x1976D2,
- Blue800 = 0x1565C0,
- Blue900 = 0x0D47A1,
- LightBlue50 = 0xE1F5FE,
- LightBlue100 = 0xB3E5FC,
- LightBlue200 = 0x81D4FA,
- LightBlue300 = 0x4FC3F7,
- LightBlue400 = 0x29B6F6,
- LightBlue500 = 0x03A9F4,
- LightBlue600 = 0x039BE5,
- LightBlue700 = 0x0288D1,
- LightBlue800 = 0x0277BD,
- LightBlue900 = 0x01579B,
- Cyan50 = 0xE0F7FA,
- Cyan100 = 0xB2EBF2,
- Cyan200 = 0x80DEEA,
- Cyan300 = 0x4DD0E1,
- Cyan400 = 0x26C6DA,
- Cyan500 = 0x00BCD4,
- Cyan600 = 0x00ACC1,
- Cyan700 = 0x0097A7,
- Cyan800 = 0x00838F,
- Cyan900 = 0x006064,
- Teal50 = 0xE0F2F1,
- Teal100 = 0xB2DFDB,
- Teal200 = 0x80CBC4,
- Teal300 = 0x4DB6AC,
- Teal400 = 0x26A69A,
- Teal500 = 0x009688,
- Teal600 = 0x00897B,
- Teal700 = 0x00796B,
- Teal800 = 0x00695C,
- Teal900 = 0x004D40,
- Green50 = 0xE8F5E9,
- Green100 = 0xC8E6C9,
- Green200 = 0xA5D6A7,
- Green300 = 0x81C784,
- Green400 = 0x66BB6A,
- Green500 = 0x4CAF50,
- Green600 = 0x43A047,
- Green700 = 0x388E3C,
- Green800 = 0x2E7D32,
- Green900 = 0x1B5E20,
- LightGreen50 = 0xF1F8E9,
- LightGreen100 = 0xDCEDC8,
- LightGreen200 = 0xC5E1A5,
- LightGreen300 = 0xAED581,
- LightGreen400 = 0x9CCC65,
- LightGreen500 = 0x8BC34A,
- LightGreen600 = 0x7CB342,
- LightGreen700 = 0x689F38,
- LightGreen800 = 0x558B2F,
- LightGreen900 = 0x33691E,
- Lime50 = 0xF9FBE7,
- Lime100 = 0xF0F4C3,
- Lime200 = 0xE6EE9C,
- Lime300 = 0xDCE775,
- Lime400 = 0xD4E157,
- Lime500 = 0xCDDC39,
- Lime600 = 0xC0CA33,
- Lime700 = 0xAFB42B,
- Lime800 = 0x9E9D24,
- Lime900 = 0x827717,
- Yellow50 = 0xFFFDE7,
- Yellow100 = 0xFFF9C4,
- Yellow200 = 0xFFF59D,
- Yellow300 = 0xFFF176,
- Yellow400 = 0xFFEE58,
- Yellow500 = 0xFFEB3B,
- Yellow600 = 0xFDD835,
- Yellow700 = 0xFBC02D,
- Yellow800 = 0xF9A825,
- Yellow900 = 0xF57F17,
- Amber50 = 0xFFF8E1,
- Amber100 = 0xFFECB3,
- Amber200 = 0xFFE082,
- Amber300 = 0xFFD54F,
- Amber400 = 0xFFCA28,
- Amber500 = 0xFFC107,
- Amber600 = 0xFFB300,
- Amber700 = 0xFFA000,
- Amber800 = 0xFF8F00,
- Amber900 = 0xFF6F00,
- Orange50 = 0xFFF3E0,
- Orange100 = 0xFFE0B2,
- Orange200 = 0xFFCC80,
- Orange300 = 0xFFB74D,
- Orange400 = 0xFFA726,
- Orange500 = 0xFF9800,
- Orange600 = 0xFB8C00,
- Orange700 = 0xF57C00,
- Orange800 = 0xEF6C00,
- Orange900 = 0xE65100,
- DeepOrange50 = 0xFBE9E7,
- DeepOrange100 = 0xFFCCBC,
- DeepOrange200 = 0xFFAB91,
- DeepOrange300 = 0xFF8A65,
- DeepOrange400 = 0xFF7043,
- DeepOrange500 = 0xFF5722,
- DeepOrange600 = 0xF4511E,
- DeepOrange700 = 0xE64A19,
- DeepOrange800 = 0xD84315,
- DeepOrange900 = 0xBF360C,
- Brown50 = 0xEFEBE9,
- Brown100 = 0xD7CCC8,
- Brown200 = 0xBCAAA4,
- Brown300 = 0xA1887F,
- Brown400 = 0x8D6E63,
- Brown500 = 0x795548,
- Brown600 = 0x6D4C41,
- Brown700 = 0x5D4037,
- Brown800 = 0x4E342E,
- Brown900 = 0x3E2723,
- Grey50 = 0xFAFAFA,
- Grey100 = 0xF5F5F5,
- Grey200 = 0xEEEEEE,
- Grey300 = 0xE0E0E0,
- Grey400 = 0xBDBDBD,
- Grey500 = 0x9E9E9E,
- Grey600 = 0x757575,
- Grey700 = 0x616161,
- Grey800 = 0x424242,
- Grey900 = 0x212121,
- BlueGrey50 = 0xECEFF1,
- BlueGrey100 = 0xCFD8DC,
- BlueGrey200 = 0xB0BEC5,
- BlueGrey300 = 0x90A4AE,
- BlueGrey400 = 0x78909C,
- BlueGrey500 = 0x607D8B,
- BlueGrey600 = 0x546E7A,
- BlueGrey700 = 0x455A64,
- BlueGrey800 = 0x37474F,
- BlueGrey900 = 0x263238,
- NewBlue = 0x063fa0,
- Mor = 0x663399,
- }
-
- public enum Accent
- {
- Gray600 = 0x828282,
- NewBlue = 0x6600ff,//0x003693
- Red100 = 0xFF8A80,
- Red200 = 0xFF5252,
- Red400 = 0xFF1744,
- Red700 = 0xD50000,
- Red800 = 0xF62459,
- Red900 = 0xff0000,
- Pink100 = 0xFF80AB,
- Pink200 = 0xFF4081,
- Pink400 = 0xF50057,
- Pink700 = 0xC51162,
- Purple100 = 0xEA80FC,
- Purple200 = 0xE040FB,
- Purple400 = 0xD500F9,
- Purple700 = 0xAA00FF,
- DeepPurple100 = 0xB388FF,
- DeepPurple200 = 0x7C4DFF,
- DeepPurple400 = 0x651FFF,
- DeepPurple700 = 0x6200EA,
- Indigo100 = 0x8C9EFF,
- Indigo200 = 0x536DFE,
- Indigo400 = 0x3D5AFE,
- Indigo700 = 0x304FFE,
- Blue100 = 0x82B1FF,
- Blue200 = 0x448AFF,
- Blue400 = 0x2979FF,
- Blue700 = 0x2962FF,
- LightBlue100 = 0x80D8FF,
- LightBlue200 = 0x40C4FF,
- LightBlue400 = 0x00B0FF,
- LightBlue700 = 0x0091EA,
- Cyan100 = 0x84FFFF,
- Cyan200 = 0x18FFFF,
- Cyan400 = 0x00E5FF,
- Cyan700 = 0x00B8D4,
- Teal100 = 0xA7FFEB,
- Teal200 = 0x64FFDA,
- Teal400 = 0x1DE9B6,
- Teal700 = 0x00BFA5,
- Green100 = 0xB9F6CA,
- Green200 = 0x69F0AE,
- Green400 = 0x00E676,
- Green700 = 0x00C853,
- LightGreen100 = 0xCCFF90,
- LightGreen200 = 0xB2FF59,
- LightGreen400 = 0x76FF03,
- LightGreen700 = 0x64DD17,
- Lime100 = 0xF4FF81,
- Lime200 = 0xEEFF41,
- Lime400 = 0xC6FF00,
- Lime700 = 0xAEEA00,
- Yellow100 = 0xFFFF8D,
- Yellow200 = 0xFFFF00,
- Yellow400 = 0xFFEA00,
- Yellow700 = 0xFFD600,
- Amber100 = 0xFFE57F,
- Amber200 = 0xFFD740,
- Amber400 = 0xFFC400,
- Amber700 = 0xFFAB00,
- Orange100 = 0xFFD180,
- Orange200 = 0xFFAB40,
- Orange400 = 0xFF9100,
- Orange700 = 0xFF6D00,
- DeepOrange100 = 0xFF9E80,
- DeepOrange200 = 0xFF6E40,
- DeepOrange400 = 0xFF3D00,
- DeepOrange700 = 0xDD2C00,
- DARK = 0x313233
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Controls/CleanForm.cs b/Library/RSBot.Theme/Controls/CleanForm.cs
deleted file mode 100644
index 416445f1..00000000
--- a/Library/RSBot.Theme/Controls/CleanForm.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Windows.Forms;
-using static RSBot.Theme.NativeMethods;
-
-namespace RSBot.Theme.Controls
-{
- public partial class CleanForm : Form
- {
- ///
- /// Variables for box shadow
- ///
- private bool _aeroEnabled;
-
- public CleanForm()
- {
- this.FormBorderStyle = FormBorderStyle.None;
- }
-
- protected override void OnMouseDown(MouseEventArgs e)
- {
- if (e.Button == MouseButtons.Left)
- {
- ReleaseCapture();
- SendMessage(Handle, WM_NCLBUTTONDOWN, HT_CAPTION, 0);
- }
- }
-
- protected override CreateParams CreateParams
- {
- get
- {
- _aeroEnabled = CheckAeroEnabled();
-
- var cp = base.CreateParams;
- if (!_aeroEnabled)
- cp.ClassStyle |= CS_DROPSHADOW;
-
- return cp;
- }
- }
-
- private bool CheckAeroEnabled()
- {
- if (Environment.OSVersion.Version.Major >= 6)
- {
- int enabled = 0;
- DwmIsCompositionEnabled(ref enabled);
- return (enabled == 1) ? true : false;
- }
- return false;
- }
-
- protected override void WndProc(ref Message m)
- {
- switch (m.Msg)
- {
- case WM_NCPAINT: // box shadow
- if (_aeroEnabled)
- {
- var v = 2;
- DwmSetWindowAttribute(this.Handle, 2, ref v, 4);
- var margins = new MARGINS()
- {
- bottomHeight = 1,
- leftWidth = 1,
- rightWidth = 1,
- topHeight = 1
- };
-
- DwmExtendFrameIntoClientArea(this.Handle, ref margins);
-
- }
- break;
- default:
- break;
- }
- base.WndProc(ref m);
-
- if (m.Msg == WM_NCHITTEST && (int)m.Result == HTCLIENT) // drag the form
- m.Result = (IntPtr)HTCAPTION;
-
- }
- }
-}
diff --git a/Library/RSBot.Theme/Controls/HorizontalPanel.cs b/Library/RSBot.Theme/Controls/HorizontalPanel.cs
deleted file mode 100644
index 7d8b2d5e..00000000
--- a/Library/RSBot.Theme/Controls/HorizontalPanel.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace RSBot.Theme.Controls
-{
- [ToolboxBitmap(typeof(Panel))]
- public class HorizontalPanel : Panel
- {
- private bool _renderOnGlass = false;
-
- public HorizontalPanel()
- {
- this.BackColor = Color.Transparent;
- this.Font = new Font("Segoe UI", 9, FontStyle.Regular, GraphicsUnit.Point, 0);
- SetStyle(ControlStyles.UserPaint, true);
- SetStyle(ControlStyles.AllPaintingInWmPaint, true);
- SetStyle(ControlStyles.DoubleBuffer, true);
- this.UpdateStyles();
- }
-
- ///
- /// Whether or not the control needs to be rendered on the Glass surface.
- ///
- ///
- /// This is false by default, it should only be toggled to true if the control needs to lay directly on
- /// the glass surface of the form.
- ///
- [Description("Gets or sets whether the control can render on an Aero glass surface."), Category("Appearance"), DefaultValue(false)]
- public bool RenderOnGlass
- {
- get
- {
- return this._renderOnGlass;
- }
- set
- {
- this._renderOnGlass = value;
- }
- }
-
- public void RedrawControlAsBitmap(IntPtr hwnd)
- {
- Control c = Control.FromHandle(hwnd);
- using (Bitmap bm = new Bitmap(c.Width, c.Height))
- {
- c.DrawToBitmap(bm, c.ClientRectangle);
- using (Graphics g = c.CreateGraphics())
- {
- Point p = new Point(-1, -1);
- g.DrawImage(bm, p);
- }
- }
- c = null;
- }
-
- protected override void OnControlAdded(ControlEventArgs e)
- {
- base.OnControlAdded(e);
- if (e.Control is LinkLabel)
- {
- e.Control.Font = new Font("Segoe UI", 9, FontStyle.Regular, GraphicsUnit.Point, 0);
- ((LinkLabel)e.Control).LinkBehavior = LinkBehavior.HoverUnderline;
- ((LinkLabel)e.Control).LinkColor = Color.FromArgb(64, 64, 64);
- ((LinkLabel)e.Control).ActiveLinkColor = Color.Blue;
- }
- }
-
- ///
- /// The actual painting of the background of our control.
- ///
- ///
- ///
- /// The colors in use here were extracted from an image of the Control Panel taken from a Windows 7 RC1 installation.
- ///
- protected override void OnPaint(PaintEventArgs e)
- {
- base.OnPaint(e);
-
- Color aeroColor1 = Color.FromArgb(204, 217, 234);
- Color aeroColor2 = Color.FromArgb(217, 227, 240); // 1
- Color aeroColor3 = Color.FromArgb(232, 238, 247);
- Color aeroColor4 = Color.FromArgb(237, 242, 249);
- Color aeroColor5 = Color.FromArgb(240, 244, 250);
- Color aeroColor6 = Color.FromArgb(241, 245, 251);
-
- Rectangle rect = new Rectangle(0, 0, this.Width, 1);
- SolidBrush sb = new SolidBrush(aeroColor1);
- e.Graphics.FillRectangle(sb, rect);
-
- rect = new Rectangle(0, 1, this.Width, 1);
- sb.Color = aeroColor2;
- e.Graphics.FillRectangle(sb, rect);
-
- rect = new Rectangle(0, 2, this.Width, 1);
- sb.Color = aeroColor3;
- e.Graphics.FillRectangle(sb, rect);
-
- rect = new Rectangle(0, 3, this.Width, 1);
- sb.Color = aeroColor3;
- e.Graphics.FillRectangle(sb, rect);
-
- rect = new Rectangle(0, 4, this.Width, 1);
- sb.Color = aeroColor4;
- e.Graphics.FillRectangle(sb, rect);
-
- rect = new Rectangle(0, 5, this.Width, 1);
- sb.Color = aeroColor5;
- e.Graphics.FillRectangle(sb, rect);
-
- rect = new Rectangle(0, 6, this.Width, this.Height - 5);
- sb.Color = aeroColor6;
- e.Graphics.FillRectangle(sb, rect);
-
- sb.Dispose();
- }
-
- ///
- /// Handles incoming Windows Messages.
- ///
- ///
- ///
- /// On the paint event and if the RenderOnGlass is set to true, we will redraw the control as an image directly on
- /// the form. This has a little extra overhead but also provides the ability to lay this control directly on the
- /// glass and have it rendered correctly.
- ///
- protected override void WndProc(ref Message m)
- {
- base.WndProc(ref m);
- int WM_PAINT = 15;
- if ((m.Msg == WM_PAINT) && this.RenderOnGlass)
- {
- this.RedrawControlAsBitmap(this.Handle);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Controls/InputDialog.resx b/Library/RSBot.Theme/Controls/InputDialog.resx
deleted file mode 100644
index 1af7de15..00000000
--- a/Library/RSBot.Theme/Controls/InputDialog.resx
+++ /dev/null
@@ -1,120 +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
-
-
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Controls/ListView.cs b/Library/RSBot.Theme/Controls/ListView.cs
deleted file mode 100644
index 900aa399..00000000
--- a/Library/RSBot.Theme/Controls/ListView.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-using RSBot.Theme.Helpers;
-using static RSBot.Theme.NativeMethods;
-
-namespace RSBot.Theme.Controls
-{
- ///
- /// An aero-styled ListView.
- ///
- ///
- /// A ListView with the "Explorer"-WindowTheme applied.
- /// If the operating system is Windows XP or older, nothing will be changed.
- ///
- [DesignerCategory("Code")]
- [DisplayName("Aero ListView")]
- [Description("An aero-styled ListView.")]
- [ToolboxItem(true)]
- [ToolboxBitmap(typeof(ListView))]
- public class ListView
- : System.Windows.Forms.ListView
- {
- private const int LVS_EX_DOUBLEBUFFER = 0x10000;
- private const int LVM_SETEXTENDEDLISTVIEWSTYLE = 4150;
-
- private const short UIS_SET = 1;
- private const short UISF_HIDEFOCUS = 0x1;
-
- private ListViewColumnSorter LvwColumnSorter { get; set; }
-
- ///
- /// Initializes a new instance of the class.
- ///
- public ListView()
- : base()
- {
- SetStyle(ControlStyles.OptimizedDoubleBuffer | ControlStyles.AllPaintingInWmPaint, true);
- LvwColumnSorter = new ListViewColumnSorter();
- ListViewItemSorter = LvwColumnSorter;
- View = View.Details;
- FullRowSelect = true;
-
- SetStyle(ControlStyles.EnableNotifyMessage, true);
- }
-
- ///
- /// Raises the event.
- ///
- /// The instance containing the event data.
- protected override void OnHandleCreated(EventArgs e)
- {
- base.OnHandleCreated(e);
-
- if (Environment.OSVersion.Version.Major >= 6)
- {
- SetWindowTheme(Handle, "explorer", null);
- SendMessage(Handle, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_DOUBLEBUFFER, LVS_EX_DOUBLEBUFFER);
- }
- }
-
- protected override void OnNotifyMessage(Message m)
- {
- if (m.Msg != 0x14)
- {
- base.OnNotifyMessage(m);
- }
- }
-
- ///
- /// Raises the event.
- ///
- /// The instance containing the event data.
- protected override void OnColumnClick(ColumnClickEventArgs e)
- {
- base.OnColumnClick(e);
-
- // Determine if clicked column is already the column that is being sorted.
- if (e.Column == LvwColumnSorter.SortColumn)
- {
- // Reverse the current sort direction for this column.
- LvwColumnSorter.Order = (LvwColumnSorter.Order == SortOrder.Ascending)
- ? SortOrder.Descending
- : SortOrder.Ascending;
- }
- else
- {
- // Set the column number that is to be sorted; default to ascending.
- LvwColumnSorter.SortColumn = e.Column;
- LvwColumnSorter.Order = SortOrder.Ascending;
- }
-
- // Perform the sort with these new sort options.
- if (!VirtualMode)
- Sort();
- }
-
- ///
- /// Select all rows on the given listview
- ///
- /// The listview whose items are to be selected
- public void SelectAllItems()
- {
- var s = System.Diagnostics.Stopwatch.StartNew();
- Focus();
- SetItemState(-1, 2, 2);
- //MessageBox.Show($"Selected in: {s.ElapsedMilliseconds} ms");
- }
-
- ///
- /// Deselect all rows on the given listview
- ///
- /// The listview whose items are to be deselected
- public void DeselectAllItems()
- {
- SetItemState(-1, 2, 0);
- }
-
- ///
- /// Set the item state on the given item
- ///
- /// The listview whose item's state is to be changed
- /// The index of the item to be changed
- /// Which bits of the value are to be set?
- /// The value to be set
- public void SetItemState(int itemIndex, int mask, int value)
- {
- LVITEM lvItem = new LVITEM();
- lvItem.stateMask = mask;
- lvItem.state = value;
- SendMessageLVItem(Handle, LVM_SETITEMSTATE, itemIndex, ref lvItem);
-
- EnsureVisible(itemIndex);
- }
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Controls/TabDisabledInfo.resx b/Library/RSBot.Theme/Controls/TabDisabledInfo.resx
deleted file mode 100644
index 1af7de15..00000000
--- a/Library/RSBot.Theme/Controls/TabDisabledInfo.resx
+++ /dev/null
@@ -1,120 +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
-
-
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Controls/XpProgressBar.cs b/Library/RSBot.Theme/Controls/XpProgressBar.cs
deleted file mode 100644
index 744e0242..00000000
--- a/Library/RSBot.Theme/Controls/XpProgressBar.cs
+++ /dev/null
@@ -1,654 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Text;
-using System.Windows.Forms;
-
-// Copyright 2004-2005 Marcos Meli - www.MarcosMeli.com.ar
-// ReSharper disable All
-namespace RSBot.Theme.Controls
-{
- #region " Gradient Mode "
-
- public enum GradientMode
- {
- Vertical,
- VerticalCenter,
- Horizontal,
- HorizontalCenter,
- Diagonal
- };
-
- #endregion " Gradient Mode "
-
- public class XpProgressBar : Control
- {
- #region " Constructor "
-
- private const string CategoryName = "Xp ProgressBar";
-
- public XpProgressBar()
- { }
-
- #endregion " Constructor "
-
- #region " Private Fields "
-
- private Color mColor1 = Color.FromArgb(170, 240, 170);
-
- private Color mColor2 = Color.FromArgb(10, 150, 10);
-
- private Color mColorBackGround = Color.White;
-
- private Color mColorText = Color.Black;
-
- private Image mDobleBack = null;
-
- private GradientMode mGradientStyle = GradientMode.VerticalCenter;
-
- private int mMax = 100;
-
- private int mMin = 0;
-
- private int mPosition = 50;
-
- private byte mSteepDistance = 2;
-
- private byte mSteepWidth = 6;
-
- #endregion " Private Fields "
-
- #region " Dispose "
-
- protected override void Dispose(bool disposing)
- {
- if (!this.IsDisposed)
- {
- mDobleBack?.Dispose();
- mBrush1?.Dispose();
- mPenIn?.Dispose();
- mBrush2?.Dispose();
- mPenOut?.Dispose();
- mPenOut2?.Dispose();
- base.Dispose(disposing);
- }
- }
-
- #endregion " Dispose "
-
- #region " Colors "
-
- [Category(CategoryName)]
- [Description("The Back Color of the Progress Bar")]
- public Color ColorBackGround
- {
- get { return mColorBackGround; }
- set
- {
- mColorBackGround = value;
- this.InvalidateBuffer(true);
- }
- }
-
- [Category(CategoryName)]
- [Description("The Border Color of the gradient in the Progress Bar")]
- public Color ColorBarBorder
- {
- get { return mColor1; }
- set
- {
- mColor1 = value;
- this.InvalidateBuffer(true);
- }
- }
-
- [Category(CategoryName)]
- [Description("The Center Color of the gradient in the Progress Bar")]
- public Color ColorBarCenter
- {
- get { return mColor2; }
- set
- {
- mColor2 = value;
- this.InvalidateBuffer(true);
- }
- }
-
- [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
- [RefreshProperties(RefreshProperties.Repaint)]
- [Description("Set to TRUE to reset all colors like the Windows XP Progress Bar �")]
- [Category(CategoryName)]
- [DefaultValue(false)]
- public bool ColorsXP
- {
- get { return false; }
- set
- {
- ColorBarBorder = Color.FromArgb(170, 240, 170);
- ColorBarCenter = Color.FromArgb(10, 150, 10);
- ColorBackGround = Color.White;
- }
- }
-
- [Category(CategoryName)]
- [Description("The Color of the text displayed in the Progress Bar")]
- public Color ColorText
- {
- get { return mColorText; }
- set
- {
- mColorText = value;
-
- if (this.Text != String.Empty)
- {
- this.Invalidate();
- }
- }
- }
-
- #endregion " Colors "
-
- #region " Position "
-
- [RefreshProperties(RefreshProperties.Repaint)]
- [Category(CategoryName)]
- [Description("The Current Position of the Progress Bar")]
- public int Position
- {
- get { return mPosition; }
- set
- {
- if (value > mMax)
- {
- mPosition = mMax;
- }
- else if (value < mMin)
- {
- mPosition = mMin;
- }
- else
- {
- mPosition = value;
- }
- this.Invalidate();
- }
- }
-
- [RefreshProperties(RefreshProperties.Repaint)]
- [Category(CategoryName)]
- [Description("The Max Position of the Progress Bar")]
- public int PositionMax
- {
- get { return mMax; }
- set
- {
- if (value > mMin)
- {
- mMax = value;
-
- if (mPosition > mMax)
- {
- Position = mMax;
- }
-
- this.InvalidateBuffer(true);
- }
- }
- }
-
- [RefreshProperties(RefreshProperties.Repaint)]
- [Category(CategoryName)]
- [Description("The Min Position of the Progress Bar")]
- public int PositionMin
- {
- get { return mMin; }
- set
- {
- if (value < mMax)
- {
- mMin = value;
-
- if (mPosition < mMin)
- {
- Position = mMin;
- }
- this.InvalidateBuffer(true);
- }
- }
- }
-
- [Category(CategoryName)]
- [Description("The number of Pixels between two Steeps in Progress Bar")]
- [DefaultValue((byte)2)]
- public byte SteepDistance
- {
- get { return mSteepDistance; }
- set
- {
- if (value >= 0)
- {
- mSteepDistance = value;
- this.InvalidateBuffer(true);
- }
- }
- }
-
- #endregion " Position "
-
- #region " Progress Style "
-
- [Category(CategoryName)]
- [Description("The Style of the gradient bar in Progress Bar")]
- [DefaultValue(GradientMode.VerticalCenter)]
- public GradientMode GradientStyle
- {
- get { return mGradientStyle; }
- set
- {
- if (mGradientStyle != value)
- {
- mGradientStyle = value;
- CreatePaintElements();
- this.Invalidate();
- }
- }
- }
-
- [Category(CategoryName)]
- [Description("The number of Pixels of the Steeps in Progress Bar")]
- [DefaultValue((byte)6)]
- public byte SteepWidth
- {
- get { return mSteepWidth; }
- set
- {
- if (value > 0)
- {
- mSteepWidth = value;
- this.InvalidateBuffer(true);
- }
- }
- }
-
- #endregion " Progress Style "
-
- #region " BackImage "
-
- [RefreshProperties(RefreshProperties.Repaint)]
- [Category(CategoryName)]
- public override Image BackgroundImage
- {
- get { return base.BackgroundImage; }
- set
- {
- base.BackgroundImage = value;
- InvalidateBuffer();
- }
- }
-
- #endregion " BackImage "
-
- #region " Text Override "
-
- [Category(CategoryName)]
- [Description("The Text displayed in the Progress Bar")]
- [DefaultValue("")]
- public override string Text
- {
- get
- {
- return base.Text;
- }
- set
- {
- if (base.Text != value)
- {
- base.Text = value;
- this.Invalidate();
- }
- }
- }
-
- #endregion " Text Override "
-
- #region " Text Shadow "
-
- private bool mTextShadow = true;
-
- [Category(CategoryName)]
- [Description("Set the Text shadow in the Progress Bar")]
- [DefaultValue(true)]
- public bool TextShadow
- {
- get { return mTextShadow; }
- set
- {
- mTextShadow = value;
- this.Invalidate();
- }
- }
-
- #endregion " Text Shadow "
-
- #region " Text Shadow Alpha "
-
- private byte mTextShadowAlpha = 150;
-
- [Category(CategoryName)]
- [Description("Set the Alpha Channel of the Text shadow in the Progress Bar")]
- [DefaultValue((byte)150)]
- public byte TextShadowAlpha
- {
- get { return mTextShadowAlpha; }
- set
- {
- if (mTextShadowAlpha != value)
- {
- mTextShadowAlpha = value;
- this.TextShadow = true;
- }
- }
- }
-
- #endregion " Text Shadow Alpha "
-
- #region " Paint Methods "
-
- #region " OnPaint "
-
- protected override void OnPaint(PaintEventArgs e)
- {
- try
- {
- //System.Diagnostics.Debug.WriteLine("Paint " + this.CharacterName + " Pos: "+this.Position.ToString());
- if (!this.IsDisposed)
- {
- int mSteepTotal = mSteepWidth + mSteepDistance;
- float mUtilWidth = this.Width - 6 + mSteepDistance;
-
- if (mDobleBack == null)
- {
- mUtilWidth = this.Width - 6 + mSteepDistance;
- int mMaxSteeps = (int)(mUtilWidth / mSteepTotal);
- this.Width = 6 + mSteepTotal * mMaxSteeps;
-
- mDobleBack = new Bitmap(this.Width, this.Height);
-
- Graphics g2 = Graphics.FromImage(mDobleBack);
-
- CreatePaintElements();
-
- g2.Clear(mColorBackGround);
-
- if (this.BackgroundImage != null)
- {
- TextureBrush textuBrush = new TextureBrush(this.BackgroundImage, WrapMode.Tile);
- g2.FillRectangle(textuBrush, 0, 0, this.Width, this.Height);
- textuBrush.Dispose();
- }
- // g2.DrawImage()
-
- g2.DrawRectangle(mPenOut2, outnnerRect2);
- g2.Dispose();
- }
-
- if (mDobleBack == null)
- return;
-
- var ima = new Bitmap(mDobleBack);
-
- Graphics gtemp = Graphics.FromImage(ima);
-
- int mCantSteeps = (int)((((float)mPosition - mMin) / (mMax - mMin)) * mUtilWidth / mSteepTotal);
-
- for (int i = 0; i < mCantSteeps; i++)
- DrawSteep(gtemp, i);
-
- if (!string.IsNullOrWhiteSpace(Text))
- DrawCenterString(gtemp, this.ClientRectangle);
-
- e.Graphics.DrawImage(ima, e.ClipRectangle.X, e.ClipRectangle.Y, e.ClipRectangle, GraphicsUnit.Pixel);
-
- ima.Dispose();
- gtemp.Dispose();
- }
- }
- catch
- {
- }
- }
-
- protected override void OnPaintBackground(PaintEventArgs e)
- {
- }
-
- #endregion " OnPaint "
-
- #region " OnSizeChange "
-
- protected override Size DefaultSize
- {
- get { return new Size(100, 29); }
- }
-
- protected override void OnSizeChanged(EventArgs e)
- {
- if (!this.IsDisposed)
- {
- if (this.Height < 12)
- {
- this.Height = 12;
- }
-
- base.OnSizeChanged(e);
- this.InvalidateBuffer(true);
- }
- }
-
- #endregion " OnSizeChange "
-
- #region " More Draw Methods "
-
- private void DisposeBrushes()
- {
- if (mBrush1 != null)
- {
- mBrush1.Dispose();
- mBrush1 = null;
- }
-
- if (mBrush2 != null)
- {
- mBrush2.Dispose();
- mBrush2 = null;
- }
- }
-
- private void DrawCenterString(Graphics gfx, Rectangle box)
- {
- gfx.CompositingQuality = CompositingQuality.HighQuality;
- gfx.TextRenderingHint = TextRenderingHint.SystemDefault;
- gfx.SmoothingMode = SmoothingMode.HighQuality;
- SizeF ss = gfx.MeasureString(this.Text, this.Font);
-
- float left = box.X + (box.Width - ss.Width) / 2;
- float top = box.Y + (box.Height - ss.Height) / 2;
-
- var shadowColor = Color.Black;
- var textColor = mColorText;
- var valuePercent = Position * 100f / PositionMax;
- if (valuePercent < 50)
- {
- shadowColor = Color.White;
- textColor = Color.Black;
- }
- else
- {
- shadowColor = Color.Black;
- textColor = Color.White;
- }
- if (mTextShadow)
- {
- SolidBrush mShadowBrush = new SolidBrush(Color.FromArgb(mTextShadowAlpha, shadowColor));
- gfx.DrawString(this.Text, this.Font, mShadowBrush, left + 1, top + 1);
- mShadowBrush.Dispose();
- }
- //SolidBrush mTextBrush = new SolidBrush(mColorText);
- SolidBrush mTextBrush = new SolidBrush(textColor);
- gfx.DrawString(this.Text, this.Font, mTextBrush, left, top);
- mTextBrush.Dispose();
- }
-
- private void DrawSteep(Graphics g, int number)
- {
- g.FillRectangle(mBrush1, 4 + number * (mSteepDistance + mSteepWidth), mSteepRect1.Y + 1, mSteepWidth, mSteepRect1.Height);
- g.FillRectangle(mBrush2, 4 + number * (mSteepDistance + mSteepWidth), mSteepRect2.Y + 1, mSteepWidth, mSteepRect2.Height - 1);
- }
-
- private void InvalidateBuffer(bool InvalidateControl = false)
- {
- if (mDobleBack != null)
- {
- mDobleBack.Dispose();
- mDobleBack = null;
- }
-
- if (InvalidateControl)
- {
- this.Invalidate();
- }
- }
-
- #endregion " More Draw Methods "
-
- #region " CreatePaintElements "
-
- private readonly Pen mPenIn = new Pen(Color.FromArgb(239, 239, 239));
- private readonly Pen mPenOut = new Pen(Color.FromArgb(104, 104, 104));
- private readonly Pen mPenOut2 = new Pen(Color.FromArgb(190, 190, 190));
- private LinearGradientBrush mBrush1;
- private LinearGradientBrush mBrush2;
- private Rectangle mSteepRect1;
- private Rectangle mSteepRect2;
- private Rectangle outnnerRect2;
-
- private void CreatePaintElements()
- {
- DisposeBrushes();
-
- switch (mGradientStyle)
- {
- case GradientMode.VerticalCenter:
-
- mSteepRect1 = new Rectangle(
- 0,
- 2,
- mSteepWidth,
- this.Height / 2 + (int)(this.Height * 0.05));
- mBrush1 = new LinearGradientBrush(mSteepRect1, mColor1, mColor2, LinearGradientMode.Vertical);
-
- mSteepRect2 = new Rectangle(
- 0,
- mSteepRect1.Bottom - 1,
- mSteepWidth,
- this.Height - mSteepRect1.Height - 4);
- mBrush2 = new LinearGradientBrush(mSteepRect2, mColor2, mColor1, LinearGradientMode.Vertical);
- break;
-
- case GradientMode.Vertical:
- mSteepRect1 = new Rectangle(
- 0,
- 3,
- mSteepWidth,
- this.Height - 7);
- mBrush1 = new LinearGradientBrush(mSteepRect1, mColor1, mColor2, LinearGradientMode.Vertical);
- mSteepRect2 = new Rectangle(
- -100,
- -100,
- 1,
- 1);
- mBrush2 = new LinearGradientBrush(mSteepRect2, mColor2, mColor1, LinearGradientMode.Horizontal);
- break;
-
- case GradientMode.Horizontal:
- mSteepRect1 = new Rectangle(
- 0,
- 3,
- mSteepWidth,
- this.Height - 7);
-
- // mBrush1 = new LinearGradientBrush(rTemp, mColor1, mColor2, LinearGradientMode.Horizontal);
- mBrush1 = new LinearGradientBrush(this.ClientRectangle, mColor1, mColor2, LinearGradientMode.Horizontal);
- mSteepRect2 = new Rectangle(
- -100,
- -100,
- 1,
- 1);
- mBrush2 = new LinearGradientBrush(mSteepRect2, Color.Red, Color.Red, LinearGradientMode.Horizontal);
- break;
-
- case GradientMode.HorizontalCenter:
- mSteepRect1 = new Rectangle(
- 0,
- 3,
- mSteepWidth,
- this.Height - 7);
- // mBrush1 = new LinearGradientBrush(rTemp, mColor1, mColor2, LinearGradientMode.Horizontal);
- mBrush1 = new LinearGradientBrush(this.ClientRectangle, mColor1, mColor2, LinearGradientMode.Horizontal);
- mBrush1.SetBlendTriangularShape(0.5f);
-
- mSteepRect2 = new Rectangle(
- -100,
- -100,
- 1,
- 1);
- mBrush2 = new LinearGradientBrush(mSteepRect2, Color.Red, Color.Red, LinearGradientMode.Horizontal);
- break;
-
- case GradientMode.Diagonal:
- mSteepRect1 = new Rectangle(
- 0,
- 3,
- mSteepWidth,
- this.Height - 7);
- // mBrush1 = new LinearGradientBrush(rTemp, mColor1, mColor2, LinearGradientMode.ForwardDiagonal);
- mBrush1 = new LinearGradientBrush(this.ClientRectangle, mColor1, mColor2, LinearGradientMode.ForwardDiagonal);
- // ((LinearGradientBrush) mBrush1).SetBlendTriangularShape(0.5f);
-
- mSteepRect2 = new Rectangle(
- -100,
- -100,
- 1,
- 1);
- mBrush2 = new LinearGradientBrush(mSteepRect2, Color.Red, Color.Red, LinearGradientMode.Horizontal);
- break;
-
- default:
- mBrush1 = new LinearGradientBrush(mSteepRect1, mColor1, mColor2, LinearGradientMode.Vertical);
- mBrush2 = new LinearGradientBrush(mSteepRect2, mColor2, mColor1, LinearGradientMode.Vertical);
- break;
- }
-
- //innerRect = new Rectangle(
- // this.ClientRectangle.X + 2,
- // this.ClientRectangle.Y + 2,
- // this.ClientRectangle.Width - 4,
- // this.ClientRectangle.Height - 4);
- //outnnerRect = new Rectangle(
- // this.ClientRectangle.X,
- // this.ClientRectangle.Y,
- // this.ClientRectangle.Width - 1,
- // this.ClientRectangle.Height - 1);
- outnnerRect2 = new Rectangle(
- this.ClientRectangle.X,
- this.ClientRectangle.Y,
- this.ClientRectangle.Width,
- this.ClientRectangle.Height);
- }
-
- #endregion " CreatePaintElements "
-
- #endregion " Paint Methods "
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Helpers/ListViewColumnSorter.cs b/Library/RSBot.Theme/Helpers/ListViewColumnSorter.cs
deleted file mode 100644
index 07fccef0..00000000
--- a/Library/RSBot.Theme/Helpers/ListViewColumnSorter.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System.Collections;
-using System.Windows.Forms;
-
-namespace RSBot.Theme.Helpers
-{
- public class ListViewColumnSorter : IComparer
- {
- ///
- /// Specifies the column to be sorted
- ///
- private int _columnToSort;
-
- ///
- /// Specifies the order in which to sort (i.e. 'Ascending').
- ///
- private SortOrder _orderOfSort;
-
- ///
- /// Case insensitive comparer object
- ///
- private readonly CaseInsensitiveComparer _objectCompare;
-
- ///
- /// Class constructor. Initializes various elements
- ///
- public ListViewColumnSorter()
- {
- _columnToSort = 0;
- _orderOfSort = SortOrder.None;
- _objectCompare = new CaseInsensitiveComparer();
- }
-
- ///
- /// This method is inherited from the IComparer interface. It compares the two objects passed using a case insensitive comparison.
- ///
- /// First object to be compared
- /// Second object to be compared
- /// The result of the comparison. "0" if equal, negative if 'x' is less than 'y' and positive if 'x' is greater than 'y'
- public int Compare(object x, object y)
- {
- var listviewX = (ListViewItem)x;
- var listviewY = (ListViewItem)y;
- if (listviewX == null ||
- listviewY == null)
- return 0;
-
- if (listviewX.SubItems[0].Text == ".." || listviewY.SubItems[0].Text == "..")
- return 0;
-
- var compareResult = _objectCompare.Compare(listviewX.SubItems[_columnToSort].Text,
- listviewY.SubItems[_columnToSort].Text);
-
- if (_orderOfSort == SortOrder.Ascending)
- return compareResult;
- else if (_orderOfSort == SortOrder.Descending)
- return -compareResult;
- else
- return 0;
- }
-
- ///
- /// Gets or sets the number of the column to which to apply the sorting operation (Defaults to '0').
- ///
- public int SortColumn
- {
- set { _columnToSort = value; }
- get { return _columnToSort; }
- }
-
- ///
- /// Gets or sets the order of sorting to apply (for example, 'Ascending' or 'Descending').
- ///
- public SortOrder Order
- {
- set { _orderOfSort = value; }
- get { return _orderOfSort; }
- }
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/IMaterialControl.cs b/Library/RSBot.Theme/IMaterialControl.cs
deleted file mode 100644
index 1062802e..00000000
--- a/Library/RSBot.Theme/IMaterialControl.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace RSBot.Theme
-{
- internal interface IMaterialControl
- {
- int Depth { get; set; }
- MaterialSkinManager SkinManager { get; }
- IMatMouseState MouseState { get; set; }
- }
-
- public enum IMatMouseState
- {
- HOVER,
- DOWN,
- OUT
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Material/Button.cs b/Library/RSBot.Theme/Material/Button.cs
deleted file mode 100644
index 53f25f37..00000000
--- a/Library/RSBot.Theme/Material/Button.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Text;
-using System.Windows.Forms;
-
-namespace RSBot.Theme.Material
-{
- using Animation;
-
- public class Button : System.Windows.Forms.Button, IMaterialControl
- {
- [Browsable(false)]
- public int Depth { get; set; }
-
- [Browsable(false)]
- public MaterialSkinManager SkinManager { get { return MaterialSkinManager.Instance; } }
-
- [Browsable(false)]
- public IMatMouseState MouseState { get; set; }
-
- public bool Primary { get; set; }
-
- public bool Raised { get; set; }
-
- private Color _singleColor = Color.Empty;
- public Color SingleColor
- {
- get => _singleColor;
- set {
- _singleColor = value;
- Invalidate();
- }
- }
-
- private readonly AnimationManager animationManager;
- private readonly AnimationManager hoverAnimationManager;
-
- private SizeF textSize;
-
- private Image _icon;
-
- public Image Icon
- {
- get { return _icon; }
- set
- {
- _icon = value;
- if (AutoSize)
- Size = GetPreferredSize();
- Invalidate();
- }
- }
-
- public Button()
- {
- Primary = false;
-
- animationManager = new AnimationManager(false)
- {
- Increment = 0.03,
- AnimationType = AnimationType.EaseOut
- };
- hoverAnimationManager = new AnimationManager
- {
- Increment = 0.07,
- AnimationType = AnimationType.Linear
- };
-
- hoverAnimationManager.OnAnimationProgress += sender => Invalidate();
- animationManager.OnAnimationProgress += sender => Invalidate();
- }
-
- public override string Text
- {
- get { return base.Text; }
- set
- {
- base.Text = value;
- textSize = CreateGraphics().MeasureString(value, Font);
- if (AutoSize)
- Size = GetPreferredSize();
- Invalidate();
- }
- }
-
- protected override void OnPaint(PaintEventArgs pevent)
- {
- var g = pevent.Graphics;
- g.SmoothingMode = SmoothingMode.HighQuality;
- g.TextRenderingHint = TextRenderingHint.SystemDefault;
-
- if (Parent.BackColor == Color.Transparent)
- g.Clear(ColorScheme.BackColor);
- else
- g.Clear(Parent.BackColor);
-
- //Hover
- Color hoverColor = SkinManager.GetFlatButtonHoverBackgroundColor();
-
- using (var backgroundPath = Utility.CreateRoundRect(ClientRectangle.X,
- ClientRectangle.Y,
- ClientRectangle.Width - 1,
- ClientRectangle.Height - 1,
- 1f))
- {
- if (Raised)
- {
- if (SingleColor == Color.Empty)
- {
- if (Enabled)
- {
- g.FillPath(Primary ? SkinManager.ColorScheme.LightPrimaryBrush : SkinManager.GetRaisedButtonBackgroundBrush(), backgroundPath);
- g.DrawPath(new Pen(Primary ? SkinManager.ColorScheme.LightPrimaryBrush : SkinManager.GetRaisedButtonBackgroundBrush()), backgroundPath);
- }
- else
- {
- g.DrawPath(new Pen(ColorScheme.BorderColor), backgroundPath);
- using (Brush b = new SolidBrush(Color.FromArgb((int)(hoverAnimationManager.GetProgress() * hoverColor.A), hoverColor.RemoveAlpha())))
- g.FillRectangle(b, ClientRectangle);
- }
- }
- else
- {
- g.FillPath(new SolidBrush(SingleColor), backgroundPath);
- g.DrawPath(new Pen(SingleColor), backgroundPath);
- }
- }
- else
- {
- g.DrawPath(new Pen(ColorScheme.BorderColor), backgroundPath);
- using (Brush b = new SolidBrush(Color.FromArgb((int)(hoverAnimationManager.GetProgress() * hoverColor.A), hoverColor.RemoveAlpha())))
- g.FillRectangle(b, ClientRectangle);
- }
- }
- //Ripple
- if (animationManager.IsAnimating())
- {
- g.SmoothingMode = SmoothingMode.AntiAlias;
- for (int i = 0; i < animationManager.GetAnimationCount(); i++)
- {
- var animationValue = animationManager.GetProgress(i);
- var animationSource = animationManager.GetSource(i);
-
- using (Brush rippleBrush = new SolidBrush(Color.FromArgb((int)(101 - (animationValue * 100)), Color.Black)))
- {
- var rippleSize = (int)(animationValue * Width * 2);
- g.FillEllipse(rippleBrush, new Rectangle(animationSource.X - rippleSize / 2, animationSource.Y - rippleSize / 2, rippleSize, rippleSize));
- }
- }
- g.SmoothingMode = SmoothingMode.None;
- }
-
- //Icon
- Rectangle iconRect = new Rectangle(8, 6, 24, 24);
-
- if (String.IsNullOrEmpty(Text))
- // Center Icon
- iconRect.X += 2;
-
- if (Icon != null)
- g.DrawImage(Icon, iconRect);
-
- //Text
- Rectangle textRect = ClientRectangle;
-
- if (Icon != null)
- {
- //
- // Resize and move Text container
- //
-
- // First 8: left padding
- // 24: icon width
- // Second 4: space between Icon and Text
- // Third 8: right padding
- textRect.Width -= 8 + 24 + 4 + 8;
-
- // First 8: left padding
- // 24: icon width
- // Second 4: space between Icon and Text
- textRect.X += 8 + 24 + 4;
- }
-
- Color foreColor = Color.Empty;
-
- if (Raised)
- {
- if (Enabled)
- foreColor = new Pen(SkinManager.GetRaisedButtonTextBrush(Primary)).Color;
- else
- foreColor = new Pen((Enabled ? (Primary ? SkinManager.ColorScheme.PrimaryBrush : SkinManager.GetPrimaryTextBrush()) : SkinManager.GetFlatButtonDisabledTextBrush())).Color;
- }
- else
- foreColor = new Pen((Enabled ? (Primary ? SkinManager.ColorScheme.PrimaryBrush : SkinManager.GetPrimaryTextBrush()) : SkinManager.GetFlatButtonDisabledTextBrush())).Color;
-
- TextFormatFlags flags = TextFormatFlags.EndEllipsis | TextFormatFlags.VerticalCenter | TextFormatFlags.HorizontalCenter;
- TextRenderer.DrawText(g, Text, Font, textRect, foreColor, flags);
- }
-
- private Size GetPreferredSize()
- {
- return GetPreferredSize(new Size(0, 0));
- }
-
- public override Size GetPreferredSize(Size proposedSize)
- {
- // Provides extra space for proper padding for content
- int extra = 16;
-
- if (Icon != null)
- // 24 is for icon size
- // 4 is for the space between icon & text
- extra += 24 + 4;
-
- return new Size((int)Math.Ceiling(textSize.Width) + extra, 36);
- }
-
- protected override void OnCreateControl()
- {
- base.OnCreateControl();
- if (DesignMode) return;
-
- MouseState = IMatMouseState.OUT;
- MouseEnter += (sender, args) =>
- {
- MouseState = IMatMouseState.HOVER;
- hoverAnimationManager.StartNewAnimation(AnimationDirection.In);
- Invalidate();
- };
- MouseLeave += (sender, args) =>
- {
- MouseState = IMatMouseState.OUT;
- hoverAnimationManager.StartNewAnimation(AnimationDirection.Out);
- Invalidate();
- };
- MouseDown += (sender, args) =>
- {
- if (args.Button == MouseButtons.Left)
- {
- MouseState = IMatMouseState.DOWN;
-
- animationManager.StartNewAnimation(AnimationDirection.In, args.Location);
- Invalidate();
- }
- };
- MouseUp += (sender, args) =>
- {
- MouseState = IMatMouseState.HOVER;
-
- Invalidate();
- };
- }
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/MaterialSkinManager.cs b/Library/RSBot.Theme/MaterialSkinManager.cs
deleted file mode 100644
index 15594178..00000000
--- a/Library/RSBot.Theme/MaterialSkinManager.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using System.Drawing;
-
-namespace RSBot.Theme
-{
- public class MaterialSkinManager
- {
- //Singleton instance
- private static MaterialSkinManager instance;
-
- public ColorScheme ColorScheme { get; set; }
-
- //Constant color values
- private static readonly Color PRIMARY_TEXT_BLACK = Color.FromArgb(222, 0, 0, 0);
-
- private static readonly Brush PRIMARY_TEXT_BLACK_BRUSH = new SolidBrush(PRIMARY_TEXT_BLACK);
- public static Color SECONDARY_TEXT_BLACK = Color.FromArgb(138, 0, 0, 0);
- public static Brush SECONDARY_TEXT_BLACK_BRUSH = new SolidBrush(SECONDARY_TEXT_BLACK);
- private static readonly Color DISABLED_OR_HINT_TEXT_BLACK = Color.FromArgb(66, 0, 0, 0);
- private static readonly Brush DISABLED_OR_HINT_TEXT_BLACK_BRUSH = new SolidBrush(DISABLED_OR_HINT_TEXT_BLACK);
- private static readonly Color DIVIDERS_BLACK = Color.FromArgb(31, 0, 0, 0);
- private static readonly Brush DIVIDERS_BLACK_BRUSH = new SolidBrush(DIVIDERS_BLACK);
-
- private static readonly Color PRIMARY_TEXT_WHITE = Color.FromArgb(255, 255, 255, 255);
- private static readonly Brush PRIMARY_TEXT_WHITE_BRUSH = new SolidBrush(PRIMARY_TEXT_WHITE);
- public static Color SECONDARY_TEXT_WHITE = Color.FromArgb(179, 255, 255, 255);
- public static Brush SECONDARY_TEXT_WHITE_BRUSH = new SolidBrush(SECONDARY_TEXT_WHITE);
- private static readonly Color DISABLED_OR_HINT_TEXT_WHITE = Color.FromArgb(77, 255, 255, 255);
- private static readonly Brush DISABLED_OR_HINT_TEXT_WHITE_BRUSH = new SolidBrush(DISABLED_OR_HINT_TEXT_WHITE);
- private static readonly Color DIVIDERS_WHITE = Color.FromArgb(31, 255, 255, 255);
- private static readonly Brush DIVIDERS_WHITE_BRUSH = new SolidBrush(DIVIDERS_WHITE);
-
- // Checkbox colors
- private static readonly Color CHECKBOX_OFF_LIGHT = Color.FromArgb(138, 0, 0, 0);
-
- private static readonly Brush CHECKBOX_OFF_LIGHT_BRUSH = new SolidBrush(CHECKBOX_OFF_LIGHT);
- private static readonly Color CHECKBOX_OFF_DISABLED_LIGHT = Color.FromArgb(66, 0, 0, 0);
- private static readonly Brush CHECKBOX_OFF_DISABLED_LIGHT_BRUSH = new SolidBrush(CHECKBOX_OFF_DISABLED_LIGHT);
-
- private static readonly Color CHECKBOX_OFF_DARK = Color.FromArgb(179, 255, 255, 255);
- private static readonly Brush CHECKBOX_OFF_DARK_BRUSH = new SolidBrush(CHECKBOX_OFF_DARK);
- private static readonly Color CHECKBOX_OFF_DISABLED_DARK = Color.FromArgb(77, 255, 255, 255);
- private static readonly Brush CHECKBOX_OFF_DISABLED_DARK_BRUSH = new SolidBrush(CHECKBOX_OFF_DISABLED_DARK);
-
- //Raised button
- private static readonly Color RAISED_BUTTON_BACKGROUND = Color.FromArgb(255, 255, 255, 255);
-
- private static readonly Brush RAISED_BUTTON_BACKGROUND_BRUSH = new SolidBrush(RAISED_BUTTON_BACKGROUND);
- private static readonly Color RAISED_BUTTON_TEXT_LIGHT = PRIMARY_TEXT_WHITE;
- private static readonly Brush RAISED_BUTTON_TEXT_LIGHT_BRUSH = new SolidBrush(RAISED_BUTTON_TEXT_LIGHT);
- private static readonly Color RAISED_BUTTON_TEXT_DARK = PRIMARY_TEXT_BLACK;
- private static readonly Brush RAISED_BUTTON_TEXT_DARK_BRUSH = new SolidBrush(RAISED_BUTTON_TEXT_DARK);
-
- //Flat button
- private static readonly Color FLAT_BUTTON_BACKGROUND_HOVER_LIGHT = Color.FromArgb(20.PercentageToColorComponent(), 0x999999.ToColor());
-
- private static readonly Brush FLAT_BUTTON_BACKGROUND_HOVER_LIGHT_BRUSH = new SolidBrush(FLAT_BUTTON_BACKGROUND_HOVER_LIGHT);
- private static readonly Color FLAT_BUTTON_BACKGROUND_PRESSED_LIGHT = Color.FromArgb(40.PercentageToColorComponent(), 0x999999.ToColor());
- private static readonly Brush FLAT_BUTTON_BACKGROUND_PRESSED_LIGHT_BRUSH = new SolidBrush(FLAT_BUTTON_BACKGROUND_PRESSED_LIGHT);
- private static readonly Brush FLAT_BUTTON_DISABLEDTEXT_LIGHT_BRUSH = new SolidBrush(Color.DarkGray);
-
- private static readonly Color FLAT_BUTTON_BACKGROUND_HOVER_DARK = Color.FromArgb(15.PercentageToColorComponent(), 0xCCCCCC.ToColor());
- private static readonly Brush FLAT_BUTTON_BACKGROUND_HOVER_DARK_BRUSH = new SolidBrush(FLAT_BUTTON_BACKGROUND_HOVER_DARK);
- private static readonly Color FLAT_BUTTON_BACKGROUND_PRESSED_DARK = Color.FromArgb(25.PercentageToColorComponent(), 0xCCCCCC.ToColor());
- private static readonly Brush FLAT_BUTTON_BACKGROUND_PRESSED_DARK_BRUSH = new SolidBrush(FLAT_BUTTON_BACKGROUND_PRESSED_DARK);
- private static readonly Brush FLAT_BUTTON_DISABLEDTEXT_DARK_BRUSH = new SolidBrush(Color.FromArgb(86, 86, 86));
-
- //ContextMenuStrip
- private static readonly Brush CMS_BACKGROUND_HOVER_LIGHT_BRUSH = new SolidBrush(Color.FromArgb(255, 238, 238, 238));
-
- private static readonly Brush CMS_BACKGROUND_HOVER_DARK_BRUSH = new SolidBrush(Color.FromArgb(38, 204, 204, 204));
-
- //Application background
- private static readonly Color BACKGROUND_LIGHT = Color.FromArgb(255, 255, 255, 255);
-
- private static Brush BACKGROUND_LIGHT_BRUSH = new SolidBrush(BACKGROUND_LIGHT);
-
- private static readonly Color BACKGROUND_DARK = Color.FromArgb(255, 51, 51, 51);
- private static Brush BACKGROUND_DARK_BRUSH = new SolidBrush(BACKGROUND_DARK);
-
- //Application action bar
- public readonly Color ACTION_BAR_TEXT = Color.FromArgb(255, 255, 255, 255);
-
- public readonly Brush ACTION_BAR_TEXT_BRUSH = new SolidBrush(Color.FromArgb(255, 255, 255, 255));
- public readonly Color ACTION_BAR_TEXT_SECONDARY = Color.FromArgb(153, 255, 255, 255);
- public readonly Brush ACTION_BAR_TEXT_SECONDARY_BRUSH = new SolidBrush(Color.FromArgb(153, 255, 255, 255));
-
- public Color GetPrimaryTextColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? PRIMARY_TEXT_BLACK : PRIMARY_TEXT_WHITE);
- }
-
- public Brush GetPrimaryTextBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? PRIMARY_TEXT_BLACK_BRUSH : PRIMARY_TEXT_WHITE_BRUSH);
- }
-
- public Color GetSecondaryTextColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? SECONDARY_TEXT_BLACK : SECONDARY_TEXT_WHITE);
- }
-
- public Brush GetSecondaryTextBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? SECONDARY_TEXT_BLACK_BRUSH : SECONDARY_TEXT_WHITE_BRUSH);
- }
-
- public Color GetDisabledOrHintColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? DISABLED_OR_HINT_TEXT_BLACK : DISABLED_OR_HINT_TEXT_WHITE);
- }
-
- public Brush GetDisabledOrHintBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? DISABLED_OR_HINT_TEXT_BLACK_BRUSH : DISABLED_OR_HINT_TEXT_WHITE_BRUSH);
- }
-
- public Color GetDividersColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? DIVIDERS_BLACK : DIVIDERS_WHITE);
- }
-
- public Brush GetDividersBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? DIVIDERS_BLACK_BRUSH : DIVIDERS_WHITE_BRUSH);
- }
-
- public Color GetCheckboxOffColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? CHECKBOX_OFF_LIGHT : CHECKBOX_OFF_DARK);
- }
-
- public Brush GetCheckboxOffBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? CHECKBOX_OFF_LIGHT_BRUSH : CHECKBOX_OFF_DARK_BRUSH);
- }
-
- public Color GetCheckBoxOffDisabledColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? CHECKBOX_OFF_DISABLED_LIGHT : CHECKBOX_OFF_DISABLED_DARK);
- }
-
- public Brush GetCheckBoxOffDisabledBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? CHECKBOX_OFF_DISABLED_LIGHT_BRUSH : CHECKBOX_OFF_DISABLED_DARK_BRUSH);
- }
-
- public Brush GetRaisedButtonBackgroundBrush()
- {
- return RAISED_BUTTON_BACKGROUND_BRUSH;
- }
-
- public Brush GetRaisedButtonTextBrush(bool primary)
- {
- return (primary ? RAISED_BUTTON_TEXT_LIGHT_BRUSH : RAISED_BUTTON_TEXT_DARK_BRUSH);
- }
-
- public Color GetFlatButtonHoverBackgroundColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? FLAT_BUTTON_BACKGROUND_HOVER_LIGHT : FLAT_BUTTON_BACKGROUND_HOVER_DARK);
- }
-
- public Brush GetFlatButtonHoverBackgroundBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? FLAT_BUTTON_BACKGROUND_HOVER_LIGHT_BRUSH : FLAT_BUTTON_BACKGROUND_HOVER_DARK_BRUSH);
- }
-
- public Color GetFlatButtonPressedBackgroundColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? FLAT_BUTTON_BACKGROUND_PRESSED_LIGHT : FLAT_BUTTON_BACKGROUND_PRESSED_DARK);
- }
-
- public Brush GetFlatButtonPressedBackgroundBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? FLAT_BUTTON_BACKGROUND_PRESSED_LIGHT_BRUSH : FLAT_BUTTON_BACKGROUND_PRESSED_DARK_BRUSH);
- }
-
- public Brush GetFlatButtonDisabledTextBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? FLAT_BUTTON_DISABLEDTEXT_LIGHT_BRUSH : FLAT_BUTTON_DISABLEDTEXT_DARK_BRUSH);
- }
-
- public Brush GetCmsSelectedItemBrush()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? CMS_BACKGROUND_HOVER_LIGHT_BRUSH : CMS_BACKGROUND_HOVER_DARK_BRUSH);
- }
-
- public Color GetApplicationBackgroundColor()
- {
- return (ColorScheme.Theme == THEME.LIGHT ? BACKGROUND_LIGHT : BACKGROUND_DARK);
- }
-
- private MaterialSkinManager()
- {
- ColorScheme = new ColorScheme(Primary.BlueGrey600, Primary.Indigo800, Primary.Blue700, Accent.NewBlue, TextShade.WHITE);
- //ColorScheme = new ColorScheme(Primary.DARK2, Primary.Indigo500, Primary.DARK, Accent.NewBlue, TextShade.WHITE);
- }
-
- public static MaterialSkinManager Instance => instance ?? (instance = new MaterialSkinManager());
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/NativeMethods.cs b/Library/RSBot.Theme/NativeMethods.cs
deleted file mode 100644
index a1c64c39..00000000
--- a/Library/RSBot.Theme/NativeMethods.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace RSBot.Theme
-{
- ///
- /// Provides some methods from the user32 and uxtheme libraries.
- ///
- internal static class NativeMethods
- {
- private const string user32 = "user32.dll";
- private const string uxtheme = "uxtheme.dll";
- private const string dwmapi = "dwmapi.dll";
-
- public const int LVM_FIRST = 0x1000;
- public const int LVM_SETITEMSTATE = LVM_FIRST + 43;
- public const int WM_NCLBUTTONDOWN = 0xA1;
- public const int HT_CAPTION = 0x2;
- public const int CS_DROPSHADOW = 0x00020000;
- public const int WM_NCPAINT = 0x0085;
- public const int WM_ACTIVATEAPP = 0x001C;
- public const int WM_NCHITTEST = 0x84;
- public const int HTCLIENT = 0x1;
- public const int HTCAPTION = 0x2;
-
- [DllImport(user32, SetLastError = true)]
- public static extern IntPtr SendMessage(IntPtr hWnd, int msg, int wParam, int lParam);
-
- [DllImport(user32, CharSet = CharSet.Unicode, SetLastError = true)]
- public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 msg, IntPtr wParam, string lParam);
-
- [DllImport(user32, SetLastError = true)]
- public static extern IntPtr LoadCursor(IntPtr hInstance, int lpCursorName);
-
- [DllImport(user32, SetLastError = true)]
- public static extern IntPtr SetCursor(IntPtr hCursor);
-
- [DllImport(user32, SetLastError = true)]
- public static extern IntPtr LoadImage(IntPtr hinst, string lpszName, uint uType, int cxDesired, int cyDesired, uint fuLoad);
-
- [DllImport(user32, SetLastError = true)]
- public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
-
- [DllImport(user32, EntryPoint = "SetWindowLong", SetLastError = true)]
- public static extern int SetWindowLong32(IntPtr hWnd, int nIndex, int dwNewLong);
-
- [DllImport(user32, EntryPoint = "SetWindowLongPtr", SetLastError = true)]
- public static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
-
- [DllImport(uxtheme, CharSet = CharSet.Unicode, SetLastError = true)]
- public extern static int SetWindowTheme(IntPtr hWnd, string pszSubAppName, string pszSubIdList);
-
- [DllImport(user32, EntryPoint = "SendMessage", CharSet = CharSet.Auto)]
- public static extern IntPtr SendMessageLVItem(IntPtr hWnd, int msg, int wParam, ref LVITEM lvi);
-
- [DllImport(user32)]
- public static extern bool ReleaseCapture();
-
- [DllImport("Gdi32.dll", EntryPoint = "DeleteObject")]
- public static extern bool DeleteObject(IntPtr hObject);
-
- [DllImport(dwmapi)]
- public static extern int DwmExtendFrameIntoClientArea(IntPtr hWnd, ref MARGINS pMarInset);
-
- [DllImport(dwmapi)]
- public static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize);
-
- [DllImport(dwmapi)]
- public static extern int DwmIsCompositionEnabled(ref int pfEnabled);
-
- public struct MARGINS // struct for box shadow
- {
- public int leftWidth;
- public int rightWidth;
- public int topHeight;
- public int bottomHeight;
- }
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
- public struct LVITEM
- {
- public int mask;
- public int iItem;
- public int iSubItem;
- public int state;
- public int stateMask;
- [MarshalAs(UnmanagedType.LPTStr)]
- public string pszText;
- public int cchTextMax;
- public int iImage;
- public IntPtr lParam;
- public int iIndent;
- public int iGroupId;
- public int cColumns;
- public IntPtr puColumns;
- };
- }
-}
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Properties/AssemblyInfo.cs b/Library/RSBot.Theme/Properties/AssemblyInfo.cs
deleted file mode 100644
index 49da26d9..00000000
--- a/Library/RSBot.Theme/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("RSBot.Theme")]
-[assembly: AssemblyDescription("A bot for Silkroad Online")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("RSBot")]
-[assembly: AssemblyProduct("RSBot.Theme")]
-[assembly: AssemblyCopyright("Copyright © 2022, RSBot Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("9e2a3ce3-d977-4e96-9f56-49288cf7d6b3")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
diff --git a/Library/RSBot.Theme/RSBot.Theme.csproj b/Library/RSBot.Theme/RSBot.Theme.csproj
deleted file mode 100644
index 4e8710fb..00000000
--- a/Library/RSBot.Theme/RSBot.Theme.csproj
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}
- Library
- Properties
- RSBot.Theme
- RSBot.Theme
- v4.7.2
- 512
-
-
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Form
-
-
- Component
-
-
- Form
-
-
- InputDialog.cs
-
-
-
-
-
-
-
-
- Component
-
-
-
-
-
- UserControl
-
-
- TabDisabledInfo.cs
-
-
- Component
-
-
-
-
-
- InputDialog.cs
-
-
- TabDisabledInfo.cs
-
-
-
-
\ No newline at end of file
diff --git a/Library/RSBot.Theme/Utility.cs b/Library/RSBot.Theme/Utility.cs
deleted file mode 100644
index 7b741732..00000000
--- a/Library/RSBot.Theme/Utility.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System.Drawing;
-using System.Drawing.Drawing2D;
-
-namespace RSBot.Theme
-{
- internal static class Utility
- {
- ///
- /// Convert an integer number to a Color.
- ///
- ///
- public static Color ToColor(this int argb)
- {
- return Color.FromArgb(
- (argb & 0xff0000) >> 16,
- (argb & 0xff00) >> 8,
- argb & 0xff);
- }
-
- ///
- /// Removes the alpha component of a color.
- ///
- ///
- ///
- public static Color RemoveAlpha(this Color color)
- {
- return Color.FromArgb(color.R, color.G, color.B);
- }
-
- ///
- /// Converts a 0-100 integer to a 0-255 color component.
- ///
- ///
- ///
- public static int PercentageToColorComponent(this int percentage)
- {
- return (int)((percentage / 100d) * 255d);
- }
-
- public static GraphicsPath CreateRoundRect(float x, float y, float width, float height, float radius)
- {
- GraphicsPath gp = new GraphicsPath();
- gp.AddLine(x + radius, y, x + width - (radius * 2), y);
- gp.AddArc(x + width - (radius * 2), y, radius * 2, radius * 2, 270, 90);
- gp.AddLine(x + width, y + radius, x + width, y + height - (radius * 2));
- gp.AddArc(x + width - (radius * 2), y + height - (radius * 2), radius * 2, radius * 2, 0, 90);
- gp.AddLine(x + width - (radius * 2), y + height, x + radius, y + height);
- gp.AddArc(x, y + height - (radius * 2), radius * 2, radius * 2, 90, 90);
- gp.AddLine(x, y + height - (radius * 2), x, y + radius);
- gp.AddArc(x, y, radius * 2, radius * 2, 180, 90);
- gp.CloseFigure();
- return gp;
- }
-
- public static GraphicsPath CreateRoundRect(Rectangle rect, float radius)
- {
- return CreateRoundRect(rect.X, rect.Y, rect.Width, rect.Height, radius);
- }
-
- public static Color BlendColor(Color backgroundColor, Color frontColor, double blend)
- {
- double ratio = blend / 255d;
- double invRatio = 1d - ratio;
- int r = (int)((backgroundColor.R * invRatio) + (frontColor.R * ratio));
- int g = (int)((backgroundColor.G * invRatio) + (frontColor.G * ratio));
- int b = (int)((backgroundColor.B * invRatio) + (frontColor.B * ratio));
- return Color.FromArgb(r, g, b);
- }
-
- public static Color BlendColor(Color backgroundColor, Color frontColor)
- {
- return BlendColor(backgroundColor, frontColor, frontColor.A);
- }
- }
-}
\ No newline at end of file
diff --git a/Plugins/RSBot.Chat/RSBot.Chat.csproj b/Plugins/RSBot.Chat/RSBot.Chat.csproj
index 543f7196..848b8f2b 100644
--- a/Plugins/RSBot.Chat/RSBot.Chat.csproj
+++ b/Plugins/RSBot.Chat/RSBot.Chat.csproj
@@ -62,11 +62,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Plugins/RSBot.General/RSBot.General.csproj b/Plugins/RSBot.General/RSBot.General.csproj
index bc2ea898..2bb78ba4 100644
--- a/Plugins/RSBot.General/RSBot.General.csproj
+++ b/Plugins/RSBot.General/RSBot.General.csproj
@@ -99,11 +99,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Plugins/RSBot.General/Views/Accounts.Designer.cs b/Plugins/RSBot.General/Views/Accounts.Designer.cs
index dc93178d..8d73f4e0 100644
--- a/Plugins/RSBot.General/Views/Accounts.Designer.cs
+++ b/Plugins/RSBot.General/Views/Accounts.Designer.cs
@@ -29,8 +29,8 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
this.panel1 = new System.Windows.Forms.Panel();
- this.btnCancel = new RSBot.Theme.Material.Button();
- this.btnOK = new RSBot.Theme.Material.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.btnOK = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.listAccounts = new System.Windows.Forms.ListBox();
this.label2 = new System.Windows.Forms.Label();
@@ -40,9 +40,9 @@ private void InitializeComponent()
this.label4 = new System.Windows.Forms.Label();
this.txtServername = new System.Windows.Forms.TextBox();
this.linkLabelPwShowHide = new System.Windows.Forms.LinkLabel();
- this.btnAdd = new RSBot.Theme.Material.Button();
- this.btnSave = new RSBot.Theme.Material.Button();
- this.buttonRemove = new RSBot.Theme.Material.Button();
+ this.btnAdd = new System.Windows.Forms.Button();
+ this.btnSave = new System.Windows.Forms.Button();
+ this.buttonRemove = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label();
this.textBoxSecondaryPassword = new System.Windows.Forms.TextBox();
this.linkLabelSecondaryPassword = new System.Windows.Forms.LinkLabel();
@@ -63,15 +63,9 @@ private void InitializeComponent()
//
// btnCancel
//
- this.btnCancel.Depth = 0;
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Icon = null;
this.btnCancel.Location = new System.Drawing.Point(313, 10);
- this.btnCancel.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Primary = false;
- this.btnCancel.Raised = false;
- this.btnCancel.SingleColor = System.Drawing.Color.Empty;
this.btnCancel.Size = new System.Drawing.Size(72, 23);
this.btnCancel.TabIndex = 7;
this.btnCancel.Text = "Cancel";
@@ -79,15 +73,9 @@ private void InitializeComponent()
//
// btnOK
//
- this.btnOK.Depth = 0;
this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.btnOK.Icon = null;
this.btnOK.Location = new System.Drawing.Point(235, 10);
- this.btnOK.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnOK.Name = "btnOK";
- this.btnOK.Primary = true;
- this.btnOK.Raised = true;
- this.btnOK.SingleColor = System.Drawing.Color.Empty;
this.btnOK.Size = new System.Drawing.Size(72, 23);
this.btnOK.TabIndex = 6;
this.btnOK.Text = "OK";
@@ -174,15 +162,9 @@ private void InitializeComponent()
//
// btnAdd
//
- this.btnAdd.Depth = 0;
this.btnAdd.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
- this.btnAdd.Icon = null;
this.btnAdd.Location = new System.Drawing.Point(197, 204);
- this.btnAdd.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnAdd.Name = "btnAdd";
- this.btnAdd.Primary = true;
- this.btnAdd.Raised = true;
- this.btnAdd.SingleColor = System.Drawing.Color.FromArgb(((int)(((byte)(93)))), ((int)(((byte)(189)))), ((int)(((byte)(166)))));
this.btnAdd.Size = new System.Drawing.Size(72, 23);
this.btnAdd.TabIndex = 4;
this.btnAdd.Text = "Add";
@@ -192,15 +174,9 @@ private void InitializeComponent()
// btnSave
//
this.btnSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.btnSave.Depth = 0;
this.btnSave.Enabled = false;
- this.btnSave.Icon = null;
this.btnSave.Location = new System.Drawing.Point(310, 204);
- this.btnSave.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnSave.Name = "btnSave";
- this.btnSave.Primary = false;
- this.btnSave.Raised = false;
- this.btnSave.SingleColor = System.Drawing.Color.Empty;
this.btnSave.Size = new System.Drawing.Size(72, 23);
this.btnSave.TabIndex = 5;
this.btnSave.Text = "Save";
@@ -209,15 +185,9 @@ private void InitializeComponent()
//
// buttonRemove
//
- this.buttonRemove.Depth = 0;
this.buttonRemove.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
- this.buttonRemove.Icon = null;
this.buttonRemove.Location = new System.Drawing.Point(197, 204);
- this.buttonRemove.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonRemove.Name = "buttonRemove";
- this.buttonRemove.Primary = true;
- this.buttonRemove.Raised = true;
- this.buttonRemove.SingleColor = System.Drawing.Color.IndianRed;
this.buttonRemove.Size = new System.Drawing.Size(72, 23);
this.buttonRemove.TabIndex = 10;
this.buttonRemove.Text = "Remove";
@@ -291,8 +261,8 @@ private void InitializeComponent()
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label1;
- private Theme.Material.Button btnCancel;
- private Theme.Material.Button btnOK;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.ListBox listAccounts;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtUsername;
@@ -300,10 +270,10 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox txtPassword;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox txtServername;
- private Theme.Material.Button btnSave;
- private Theme.Material.Button btnAdd;
+ private System.Windows.Forms.Button btnSave;
+ private System.Windows.Forms.Button btnAdd;
private System.Windows.Forms.LinkLabel linkLabelPwShowHide;
- private Theme.Material.Button buttonRemove;
+ private System.Windows.Forms.Button buttonRemove;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox textBoxSecondaryPassword;
private System.Windows.Forms.LinkLabel linkLabelSecondaryPassword;
diff --git a/Plugins/RSBot.General/Views/Main.Designer.cs b/Plugins/RSBot.General/Views/Main.Designer.cs
index 63d6dbdc..25f2d839 100644
--- a/Plugins/RSBot.General/Views/Main.Designer.cs
+++ b/Plugins/RSBot.General/Views/Main.Designer.cs
@@ -30,7 +30,7 @@ private void InitializeComponent()
{
this.label1 = new System.Windows.Forms.Label();
this.txtSilkroadPath = new System.Windows.Forms.TextBox();
- this.btnBrowseSilkroadPath = new RSBot.Theme.Material.Button();
+ this.btnBrowseSilkroadPath = new System.Windows.Forms.Button();
this.lblVersion = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.panel3 = new System.Windows.Forms.Panel();
@@ -48,12 +48,12 @@ private void InitializeComponent()
this.label4 = new System.Windows.Forms.Label();
this.checkEnableAutoLogin = new System.Windows.Forms.CheckBox();
this.comboCharacter = new System.Windows.Forms.ComboBox();
- this.btnAutoLoginSettings = new RSBot.Theme.Material.Button();
+ this.btnAutoLoginSettings = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.btnClientHideShow = new RSBot.Theme.Material.Button();
- this.btnStartClient = new RSBot.Theme.Material.Button();
- this.btnStartClientless = new RSBot.Theme.Material.Button();
- this.btnGoClientless = new RSBot.Theme.Material.Button();
+ this.btnClientHideShow = new System.Windows.Forms.Button();
+ this.btnStartClient = new System.Windows.Forms.Button();
+ this.btnStartClientless = new System.Windows.Forms.Button();
+ this.btnGoClientless = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.label2 = new System.Windows.Forms.Label();
this.checkStayConnected = new System.Windows.Forms.CheckBox();
@@ -90,14 +90,8 @@ private void InitializeComponent()
//
// btnBrowseSilkroadPath
//
- this.btnBrowseSilkroadPath.Depth = 0;
- this.btnBrowseSilkroadPath.Icon = null;
this.btnBrowseSilkroadPath.Location = new System.Drawing.Point(715, 30);
- this.btnBrowseSilkroadPath.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnBrowseSilkroadPath.Name = "btnBrowseSilkroadPath";
- this.btnBrowseSilkroadPath.Primary = false;
- this.btnBrowseSilkroadPath.Raised = false;
- this.btnBrowseSilkroadPath.SingleColor = System.Drawing.Color.Empty;
this.btnBrowseSilkroadPath.Size = new System.Drawing.Size(32, 21);
this.btnBrowseSilkroadPath.TabIndex = 2;
this.btnBrowseSilkroadPath.Text = "...";
@@ -106,10 +100,9 @@ private void InitializeComponent()
//
// lblVersion
//
- this.lblVersion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.lblVersion.AutoSize = true;
this.lblVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblVersion.Location = new System.Drawing.Point(711, 11);
+ this.lblVersion.Location = new System.Drawing.Point(707, 11);
this.lblVersion.Name = "lblVersion";
this.lblVersion.Size = new System.Drawing.Size(40, 15);
this.lblVersion.TabIndex = 3;
@@ -122,7 +115,7 @@ private void InitializeComponent()
this.groupBox1.Controls.Add(this.panel3);
this.groupBox1.Controls.Add(this.captchaPanel);
this.groupBox1.Controls.Add(this.autoLoginTopPanel);
- this.groupBox1.Location = new System.Drawing.Point(19, 163);
+ this.groupBox1.Location = new System.Drawing.Point(19, 166);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(355, 274);
this.groupBox1.TabIndex = 14;
@@ -289,14 +282,8 @@ private void InitializeComponent()
//
// btnAutoLoginSettings
//
- this.btnAutoLoginSettings.Depth = 0;
- this.btnAutoLoginSettings.Icon = null;
this.btnAutoLoginSettings.Location = new System.Drawing.Point(256, 61);
- this.btnAutoLoginSettings.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnAutoLoginSettings.Name = "btnAutoLoginSettings";
- this.btnAutoLoginSettings.Primary = false;
- this.btnAutoLoginSettings.Raised = false;
- this.btnAutoLoginSettings.SingleColor = System.Drawing.Color.Empty;
this.btnAutoLoginSettings.Size = new System.Drawing.Size(75, 23);
this.btnAutoLoginSettings.TabIndex = 2;
this.btnAutoLoginSettings.Text = "Setup";
@@ -311,22 +298,16 @@ private void InitializeComponent()
this.groupBox2.Controls.Add(this.btnGoClientless);
this.groupBox2.Location = new System.Drawing.Point(19, 67);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(355, 84);
+ this.groupBox2.Size = new System.Drawing.Size(355, 93);
this.groupBox2.TabIndex = 15;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Start game";
//
// btnClientHideShow
//
- this.btnClientHideShow.Depth = 0;
this.btnClientHideShow.Enabled = false;
- this.btnClientHideShow.Icon = null;
- this.btnClientHideShow.Location = new System.Drawing.Point(18, 46);
- this.btnClientHideShow.MouseState = RSBot.Theme.IMatMouseState.HOVER;
+ this.btnClientHideShow.Location = new System.Drawing.Point(18, 49);
this.btnClientHideShow.Name = "btnClientHideShow";
- this.btnClientHideShow.Primary = false;
- this.btnClientHideShow.Raised = false;
- this.btnClientHideShow.SingleColor = System.Drawing.Color.Empty;
this.btnClientHideShow.Size = new System.Drawing.Size(125, 23);
this.btnClientHideShow.TabIndex = 19;
this.btnClientHideShow.Text = "Client Visibility";
@@ -335,14 +316,8 @@ private void InitializeComponent()
//
// btnStartClient
//
- this.btnStartClient.Depth = 0;
- this.btnStartClient.Icon = null;
- this.btnStartClient.Location = new System.Drawing.Point(18, 16);
- this.btnStartClient.MouseState = RSBot.Theme.IMatMouseState.HOVER;
+ this.btnStartClient.Location = new System.Drawing.Point(18, 19);
this.btnStartClient.Name = "btnStartClient";
- this.btnStartClient.Primary = true;
- this.btnStartClient.Raised = true;
- this.btnStartClient.SingleColor = System.Drawing.Color.Empty;
this.btnStartClient.Size = new System.Drawing.Size(125, 23);
this.btnStartClient.TabIndex = 16;
this.btnStartClient.Text = "Start Client";
@@ -351,14 +326,8 @@ private void InitializeComponent()
//
// btnStartClientless
//
- this.btnStartClientless.Depth = 0;
- this.btnStartClientless.Icon = null;
- this.btnStartClientless.Location = new System.Drawing.Point(212, 16);
- this.btnStartClientless.MouseState = RSBot.Theme.IMatMouseState.HOVER;
+ this.btnStartClientless.Location = new System.Drawing.Point(212, 19);
this.btnStartClientless.Name = "btnStartClientless";
- this.btnStartClientless.Primary = false;
- this.btnStartClientless.Raised = false;
- this.btnStartClientless.SingleColor = System.Drawing.Color.Empty;
this.btnStartClientless.Size = new System.Drawing.Size(125, 24);
this.btnStartClientless.TabIndex = 18;
this.btnStartClientless.Text = "Start Clientless";
@@ -367,15 +336,9 @@ private void InitializeComponent()
//
// btnGoClientless
//
- this.btnGoClientless.Depth = 0;
this.btnGoClientless.Enabled = false;
- this.btnGoClientless.Icon = null;
- this.btnGoClientless.Location = new System.Drawing.Point(212, 46);
- this.btnGoClientless.MouseState = RSBot.Theme.IMatMouseState.HOVER;
+ this.btnGoClientless.Location = new System.Drawing.Point(212, 49);
this.btnGoClientless.Name = "btnGoClientless";
- this.btnGoClientless.Primary = false;
- this.btnGoClientless.Raised = false;
- this.btnGoClientless.SingleColor = System.Drawing.Color.Empty;
this.btnGoClientless.Size = new System.Drawing.Size(125, 24);
this.btnGoClientless.TabIndex = 17;
this.btnGoClientless.Text = "Go Clientless";
@@ -388,7 +351,7 @@ private void InitializeComponent()
this.groupBox3.Controls.Add(this.checkStayConnected);
this.groupBox3.Location = new System.Drawing.Point(389, 67);
this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(359, 84);
+ this.groupBox3.Size = new System.Drawing.Size(359, 93);
this.groupBox3.TabIndex = 16;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Client settings";
@@ -421,7 +384,7 @@ private void InitializeComponent()
this.groupBox4.Controls.Add(this.checkBoxBotTrayMinimized);
this.groupBox4.Location = new System.Drawing.Point(389, 166);
this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(359, 88);
+ this.groupBox4.Size = new System.Drawing.Size(359, 98);
this.groupBox4.TabIndex = 17;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "Bot Settings";
@@ -473,7 +436,7 @@ private void InitializeComponent()
this.Controls.Add(this.txtSilkroadPath);
this.Controls.Add(this.label1);
this.Name = "Main";
- this.Size = new System.Drawing.Size(754, 467);
+ this.Size = new System.Drawing.Size(803, 467);
this.groupBox1.ResumeLayout(false);
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -495,13 +458,13 @@ private void InitializeComponent()
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtSilkroadPath;
- private Theme.Material.Button btnBrowseSilkroadPath;
+ private System.Windows.Forms.Button btnBrowseSilkroadPath;
private System.Windows.Forms.Label lblVersion;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.ComboBox comboAccounts;
private System.Windows.Forms.CheckBox checkEnableAutoLogin;
- private Theme.Material.Button btnAutoLoginSettings;
+ private System.Windows.Forms.Button btnAutoLoginSettings;
private System.Windows.Forms.TextBox txtStaticCaptcha;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.CheckBox checkEnableStaticCaptcha;
@@ -509,16 +472,16 @@ private void InitializeComponent()
private System.Windows.Forms.Label label7;
private System.Windows.Forms.ComboBox comboCharacter;
private System.Windows.Forms.GroupBox groupBox2;
- private Theme.Material.Button btnGoClientless;
- private Theme.Material.Button btnStartClientless;
- private Theme.Material.Button btnStartClient;
+ private System.Windows.Forms.Button btnGoClientless;
+ private System.Windows.Forms.Button btnStartClientless;
+ private System.Windows.Forms.Button btnStartClient;
private System.Windows.Forms.CheckBox checkUseReturnScroll;
private System.Windows.Forms.CheckBox checkStartBot;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox checkStayConnected;
private System.Windows.Forms.Label label2;
- private Theme.Material.Button btnClientHideShow;
+ private System.Windows.Forms.Button btnClientHideShow;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.CheckBox checkBoxBotTrayMinimized;
diff --git a/Plugins/RSBot.General/Views/PendingWindow.Designer.cs b/Plugins/RSBot.General/Views/PendingWindow.Designer.cs
index 3bdcbd3d..cc564440 100644
--- a/Plugins/RSBot.General/Views/PendingWindow.Designer.cs
+++ b/Plugins/RSBot.General/Views/PendingWindow.Designer.cs
@@ -37,7 +37,7 @@ private void InitializeComponent()
this.labelMyWaitingTime = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.timer = new System.Windows.Forms.Timer(this.components);
- this.buttonCancel = new RSBot.Theme.Material.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// labelServerName
@@ -118,15 +118,9 @@ private void InitializeComponent()
//
// buttonCancel
//
- this.buttonCancel.Depth = 0;
this.buttonCancel.Font = new System.Drawing.Font("Segoe UI Semibold", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonCancel.Icon = null;
this.buttonCancel.Location = new System.Drawing.Point(106, 205);
- this.buttonCancel.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonCancel.Name = "buttonCancel";
- this.buttonCancel.Primary = true;
- this.buttonCancel.Raised = true;
- this.buttonCancel.SingleColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
this.buttonCancel.Size = new System.Drawing.Size(191, 23);
this.buttonCancel.TabIndex = 1;
this.buttonCancel.Text = "Cancel the waiting";
@@ -172,7 +166,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label labelAvgWaitingTime;
private System.Windows.Forms.Label labelMyWaitingTime;
private System.Windows.Forms.Label label5;
- private Theme.Material.Button buttonCancel;
+ private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.Timer timer;
}
}
\ No newline at end of file
diff --git a/Plugins/RSBot.General/Views/PendingWindow.cs b/Plugins/RSBot.General/Views/PendingWindow.cs
index 38214335..ce2c07d8 100644
--- a/Plugins/RSBot.General/Views/PendingWindow.cs
+++ b/Plugins/RSBot.General/Views/PendingWindow.cs
@@ -1,13 +1,12 @@
using RSBot.Core.Network;
using RSBot.General.Components;
-using RSBot.Theme.Controls;
using System;
using System.Text;
using System.Windows.Forms;
namespace RSBot.General.Views
{
- public partial class PendingWindow : CleanForm
+ public partial class PendingWindow : Form
{
///
/// Started tick
diff --git a/Plugins/RSBot.Inventory/RSBot.Inventory.csproj b/Plugins/RSBot.Inventory/RSBot.Inventory.csproj
index 8e2b3fa6..2f368213 100644
--- a/Plugins/RSBot.Inventory/RSBot.Inventory.csproj
+++ b/Plugins/RSBot.Inventory/RSBot.Inventory.csproj
@@ -66,11 +66,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Plugins/RSBot.Inventory/Views/Main.Designer.cs b/Plugins/RSBot.Inventory/Views/Main.Designer.cs
index edea2cbe..2171dffa 100644
--- a/Plugins/RSBot.Inventory/Views/Main.Designer.cs
+++ b/Plugins/RSBot.Inventory/Views/Main.Designer.cs
@@ -34,13 +34,13 @@ private void InitializeComponent()
this.label2 = new System.Windows.Forms.Label();
this.lblFreeSlots = new System.Windows.Forms.Label();
this.imgItems = new System.Windows.Forms.ImageList(this.components);
- this.listViewMain = new RSBot.Theme.Controls.ListView();
+ this.listViewMain = new System.Windows.Forms.ListView();
this.colName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colAmount = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colGenderRace = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
- this.buttonUseItem = new RSBot.Theme.Material.Button();
+ this.buttonUseItem = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.SuspendLayout();
@@ -160,15 +160,9 @@ private void InitializeComponent()
// buttonUseItem
//
this.buttonUseItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonUseItem.Depth = 0;
this.buttonUseItem.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonUseItem.Icon = null;
this.buttonUseItem.Location = new System.Drawing.Point(657, 3);
- this.buttonUseItem.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonUseItem.Name = "buttonUseItem";
- this.buttonUseItem.Primary = true;
- this.buttonUseItem.Raised = true;
- this.buttonUseItem.SingleColor = System.Drawing.Color.Empty;
this.buttonUseItem.Size = new System.Drawing.Size(75, 23);
this.buttonUseItem.TabIndex = 6;
this.buttonUseItem.Text = "Use";
@@ -199,7 +193,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox comboInventoryType;
- private Theme.Controls.ListView listViewMain;
+ private System.Windows.Forms.ListView listViewMain;
private System.Windows.Forms.ColumnHeader colName;
private System.Windows.Forms.ColumnHeader colAmount;
private System.Windows.Forms.Label label2;
@@ -208,6 +202,6 @@ private void InitializeComponent()
private System.Windows.Forms.ImageList imgItems;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
- private Theme.Material.Button buttonUseItem;
+ private System.Windows.Forms.Button buttonUseItem;
}
}
diff --git a/Plugins/RSBot.Inventory/Views/UseItemDialog.Designer.cs b/Plugins/RSBot.Inventory/Views/UseItemDialog.Designer.cs
index f6811f6b..5f9d0d24 100644
--- a/Plugins/RSBot.Inventory/Views/UseItemDialog.Designer.cs
+++ b/Plugins/RSBot.Inventory/Views/UseItemDialog.Designer.cs
@@ -29,23 +29,17 @@ protected override void Dispose(bool disposing)
///
private void InitializeComponent()
{
- this.buttonOk = new RSBot.Theme.Material.Button();
- this.buttonCancel = new RSBot.Theme.Material.Button();
+ this.buttonOk = new System.Windows.Forms.Button();
+ this.buttonCancel = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// buttonOk
//
- this.buttonOk.Depth = 0;
this.buttonOk.Font = new System.Drawing.Font("Segoe UI Semibold", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonOk.Icon = null;
this.buttonOk.Location = new System.Drawing.Point(28, 72);
- this.buttonOk.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonOk.Name = "buttonOk";
- this.buttonOk.Primary = true;
- this.buttonOk.Raised = true;
- this.buttonOk.SingleColor = System.Drawing.Color.Empty;
this.buttonOk.Size = new System.Drawing.Size(215, 42);
this.buttonOk.TabIndex = 0;
this.buttonOk.Text = "Use Directly";
@@ -53,16 +47,10 @@ private void InitializeComponent()
//
// buttonCancel
//
- this.buttonCancel.Depth = 0;
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.buttonCancel.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonCancel.Icon = null;
this.buttonCancel.Location = new System.Drawing.Point(28, 193);
- this.buttonCancel.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonCancel.Name = "buttonCancel";
- this.buttonCancel.Primary = false;
- this.buttonCancel.Raised = false;
- this.buttonCancel.SingleColor = System.Drawing.Color.Empty;
this.buttonCancel.Size = new System.Drawing.Size(215, 42);
this.buttonCancel.TabIndex = 1;
this.buttonCancel.Text = "Use with conditions";
@@ -115,8 +103,8 @@ private void InitializeComponent()
#endregion
- private Theme.Material.Button buttonOk;
- private Theme.Material.Button buttonCancel;
+ private System.Windows.Forms.Button buttonOk;
+ private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
}
diff --git a/Plugins/RSBot.Log/RSBot.Log.csproj b/Plugins/RSBot.Log/RSBot.Log.csproj
index f591840b..b18c2f9e 100644
--- a/Plugins/RSBot.Log/RSBot.Log.csproj
+++ b/Plugins/RSBot.Log/RSBot.Log.csproj
@@ -59,11 +59,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Plugins/RSBot.Log/Views/Main.Designer.cs b/Plugins/RSBot.Log/Views/Main.Designer.cs
index ccffe0ba..63749ccf 100644
--- a/Plugins/RSBot.Log/Views/Main.Designer.cs
+++ b/Plugins/RSBot.Log/Views/Main.Designer.cs
@@ -29,7 +29,7 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
this.checkEnabled = new System.Windows.Forms.CheckBox();
- this.btnReset = new RSBot.Theme.Material.Button();
+ this.btnReset = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
this.checkNormal = new System.Windows.Forms.CheckBox();
this.checkError = new System.Windows.Forms.CheckBox();
@@ -53,14 +53,8 @@ private void InitializeComponent()
// btnReset
//
this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnReset.Depth = 0;
- this.btnReset.Icon = null;
this.btnReset.Location = new System.Drawing.Point(627, 17);
- this.btnReset.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnReset.Name = "btnReset";
- this.btnReset.Primary = false;
- this.btnReset.Raised = false;
- this.btnReset.SingleColor = System.Drawing.Color.Empty;
this.btnReset.Size = new System.Drawing.Size(75, 23);
this.btnReset.TabIndex = 0;
this.btnReset.Text = "Clear";
@@ -159,7 +153,7 @@ private void InitializeComponent()
}
#endregion
- private Theme.Material.Button btnReset;
+ private System.Windows.Forms.Button btnReset;
private System.Windows.Forms.CheckBox checkEnabled;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.TextBox txtLog;
diff --git a/Plugins/RSBot.Map/RSBot.Map.csproj b/Plugins/RSBot.Map/RSBot.Map.csproj
index ecb2d07b..4e2dd8a1 100644
--- a/Plugins/RSBot.Map/RSBot.Map.csproj
+++ b/Plugins/RSBot.Map/RSBot.Map.csproj
@@ -64,11 +64,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Plugins/RSBot.Map/Views/Main.Designer.cs b/Plugins/RSBot.Map/Views/Main.Designer.cs
index 83dda59a..db4ba3db 100644
--- a/Plugins/RSBot.Map/Views/Main.Designer.cs
+++ b/Plugins/RSBot.Map/Views/Main.Designer.cs
@@ -41,14 +41,14 @@ private void InitializeComponent()
this.comboViewType = new System.Windows.Forms.ComboBox();
this.trmInterval = new System.Windows.Forms.Timer(this.components);
this.labelSectorInfo = new System.Windows.Forms.Label();
- this.lvMonster = new RSBot.Theme.Controls.ListView();
+ this.lvMonster = new System.Windows.Forms.ListView();
this.colName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colType = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colLevel = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colPosition = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.buttonZoomIn = new RSBot.Theme.Material.Button();
- this.buttonZoomReset = new RSBot.Theme.Material.Button();
- this.buttonZoomOut = new RSBot.Theme.Material.Button();
+ this.buttonZoomIn = new System.Windows.Forms.Button();
+ this.buttonZoomReset = new System.Windows.Forms.Button();
+ this.buttonZoomOut = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.mapCanvas)).BeginInit();
this.SuspendLayout();
//
@@ -195,16 +195,10 @@ private void InitializeComponent()
//
// buttonZoomIn
//
- this.buttonZoomIn.Depth = 0;
this.buttonZoomIn.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
this.buttonZoomIn.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.buttonZoomIn.Icon = null;
this.buttonZoomIn.Location = new System.Drawing.Point(295, 80);
- this.buttonZoomIn.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonZoomIn.Name = "buttonZoomIn";
- this.buttonZoomIn.Primary = true;
- this.buttonZoomIn.Raised = true;
- this.buttonZoomIn.SingleColor = System.Drawing.Color.SlateGray;
this.buttonZoomIn.Size = new System.Drawing.Size(24, 24);
this.buttonZoomIn.TabIndex = 16;
this.buttonZoomIn.Text = "5";
@@ -213,16 +207,10 @@ private void InitializeComponent()
//
// buttonZoomReset
//
- this.buttonZoomReset.Depth = 0;
this.buttonZoomReset.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
this.buttonZoomReset.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.buttonZoomReset.Icon = null;
this.buttonZoomReset.Location = new System.Drawing.Point(295, 110);
- this.buttonZoomReset.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonZoomReset.Name = "buttonZoomReset";
- this.buttonZoomReset.Primary = true;
- this.buttonZoomReset.Raised = true;
- this.buttonZoomReset.SingleColor = System.Drawing.Color.SlateGray;
this.buttonZoomReset.Size = new System.Drawing.Size(24, 24);
this.buttonZoomReset.TabIndex = 16;
this.buttonZoomReset.Text = "n";
@@ -231,16 +219,10 @@ private void InitializeComponent()
//
// buttonZoomOut
//
- this.buttonZoomOut.Depth = 0;
this.buttonZoomOut.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
this.buttonZoomOut.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.buttonZoomOut.Icon = null;
this.buttonZoomOut.Location = new System.Drawing.Point(295, 140);
- this.buttonZoomOut.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonZoomOut.Name = "buttonZoomOut";
- this.buttonZoomOut.Primary = true;
- this.buttonZoomOut.Raised = true;
- this.buttonZoomOut.SingleColor = System.Drawing.Color.SlateGray;
this.buttonZoomOut.Size = new System.Drawing.Size(24, 24);
this.buttonZoomOut.TabIndex = 16;
this.buttonZoomOut.Text = "6";
@@ -281,7 +263,7 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblX;
private System.Windows.Forms.Label lblY;
private System.Windows.Forms.Label lblRegion;
- private Theme.Controls.ListView lvMonster;
+ private System.Windows.Forms.ListView lvMonster;
private System.Windows.Forms.ColumnHeader colName;
private System.Windows.Forms.ColumnHeader colType;
private System.Windows.Forms.ColumnHeader colLevel;
@@ -290,8 +272,8 @@ private void InitializeComponent()
private System.Windows.Forms.ColumnHeader colPosition;
private System.Windows.Forms.Timer trmInterval;
private System.Windows.Forms.Label labelSectorInfo;
- private Theme.Material.Button buttonZoomIn;
- private Theme.Material.Button buttonZoomReset;
- private Theme.Material.Button buttonZoomOut;
+ private System.Windows.Forms.Button buttonZoomIn;
+ private System.Windows.Forms.Button buttonZoomReset;
+ private System.Windows.Forms.Button buttonZoomOut;
}
}
diff --git a/Plugins/RSBot.Party/RSBot.Party.csproj b/Plugins/RSBot.Party/RSBot.Party.csproj
index 347e6c04..1dfbd790 100644
--- a/Plugins/RSBot.Party/RSBot.Party.csproj
+++ b/Plugins/RSBot.Party/RSBot.Party.csproj
@@ -80,11 +80,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Plugins/RSBot.Party/Views/AutoFormParty.designer.cs b/Plugins/RSBot.Party/Views/AutoFormParty.designer.cs
index 24b8107c..2a1e2c2e 100644
--- a/Plugins/RSBot.Party/Views/AutoFormParty.designer.cs
+++ b/Plugins/RSBot.Party/Views/AutoFormParty.designer.cs
@@ -28,8 +28,8 @@ protected override void Dispose(bool disposing)
///
private void InitializeComponent()
{
- this.btnAccept = new RSBot.Theme.Material.Button();
- this.btnCancel = new RSBot.Theme.Material.Button();
+ this.btnAccept = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
this.gbObjective = new System.Windows.Forms.GroupBox();
this.rbtn_Thief = new System.Windows.Forms.RadioButton();
this.rbtn_Trade = new System.Windows.Forms.RadioButton();
@@ -61,15 +61,9 @@ private void InitializeComponent()
//
// btnAccept
//
- this.btnAccept.Depth = 0;
this.btnAccept.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.btnAccept.Icon = null;
this.btnAccept.Location = new System.Drawing.Point(12, 292);
- this.btnAccept.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnAccept.Name = "btnAccept";
- this.btnAccept.Primary = true;
- this.btnAccept.Raised = true;
- this.btnAccept.SingleColor = System.Drawing.Color.Empty;
this.btnAccept.Size = new System.Drawing.Size(75, 23);
this.btnAccept.TabIndex = 0;
this.btnAccept.Text = "Accept";
@@ -78,15 +72,9 @@ private void InitializeComponent()
//
// btnCancel
//
- this.btnCancel.Depth = 0;
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnCancel.Icon = null;
this.btnCancel.Location = new System.Drawing.Point(271, 292);
- this.btnCancel.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Primary = false;
- this.btnCancel.Raised = false;
- this.btnCancel.SingleColor = System.Drawing.Color.Empty;
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 1;
this.btnCancel.Text = "Cancel";
@@ -383,8 +371,8 @@ private void InitializeComponent()
#endregion
- private Theme.Material.Button btnAccept;
- private Theme.Material.Button btnCancel;
+ private System.Windows.Forms.Button btnAccept;
+ private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.GroupBox gbObjective;
private System.Windows.Forms.RadioButton rbtn_Quest;
private System.Windows.Forms.RadioButton rbtn_Hunting;
diff --git a/Plugins/RSBot.Party/Views/Main.Designer.cs b/Plugins/RSBot.Party/Views/Main.Designer.cs
index ece9218c..426e0750 100644
--- a/Plugins/RSBot.Party/Views/Main.Designer.cs
+++ b/Plugins/RSBot.Party/Views/Main.Designer.cs
@@ -30,7 +30,7 @@ private void InitializeComponent()
{
this.tabMain = new System.Windows.Forms.TabControl();
this.tabCurrentParty = new System.Windows.Forms.TabPage();
- this.listParty = new RSBot.Theme.Controls.ListView();
+ this.listParty = new System.Windows.Forms.ListView();
this.colMemberName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colLevel = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colGuild = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -41,7 +41,7 @@ private void InitializeComponent()
this.menuLeave = new System.Windows.Forms.MenuItem();
this.menuItemAddToBuffing = new System.Windows.Forms.MenuItem();
this.panel1 = new System.Windows.Forms.Panel();
- this.btnLeaveParty = new RSBot.Theme.Material.Button();
+ this.btnLeaveParty = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.lblLeader = new System.Windows.Forms.Label();
this.grpPartySettings = new System.Windows.Forms.GroupBox();
@@ -51,8 +51,8 @@ private void InitializeComponent()
this.tpAutoParty = new System.Windows.Forms.TabPage();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.listAutoParty = new System.Windows.Forms.ListBox();
- this.btnRemoveFromAutoParty = new RSBot.Theme.Material.Button();
- this.btnAddToAutoParty = new RSBot.Theme.Material.Button();
+ this.btnRemoveFromAutoParty = new System.Windows.Forms.Button();
+ this.btnAddToAutoParty = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.checkAcceptIfBotStopped = new System.Windows.Forms.CheckBox();
this.checkAcceptAtTrainingPlace = new System.Windows.Forms.CheckBox();
@@ -66,7 +66,7 @@ private void InitializeComponent()
this.checkAutoItemAutoShare = new System.Windows.Forms.CheckBox();
this.checkAutoExpAutoShare = new System.Windows.Forms.CheckBox();
this.tpPartyMatching = new System.Windows.Forms.TabPage();
- this.lvPartyMatching = new RSBot.Theme.Controls.ListView();
+ this.lvPartyMatching = new System.Windows.Forms.ListView();
this.chPartyMatchNo = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chPartyMatchRace = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chPartyMatchName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -75,8 +75,8 @@ private void InitializeComponent()
this.chPartyMatchMember = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chPartyMatchRange = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.topPartyPanel = new System.Windows.Forms.Panel();
- this.btnPartyRefresh = new RSBot.Theme.Material.Button();
- this.btnPartySearch = new RSBot.Theme.Material.Button();
+ this.btnPartyRefresh = new System.Windows.Forms.Button();
+ this.btnPartySearch = new System.Windows.Forms.Button();
this.nudPartySearchMax = new System.Windows.Forms.NumericUpDown();
this.nudPartySearchMin = new System.Windows.Forms.NumericUpDown();
this.cbPartySearchPurpose = new System.Windows.Forms.ComboBox();
@@ -85,35 +85,35 @@ private void InitializeComponent()
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.bottomPartyPanel = new RSBot.Theme.Controls.HorizontalPanel();
- this.btnPartyMatchDeleteEntry = new RSBot.Theme.Material.Button();
- this.btnPartyMatchChangeEntry = new RSBot.Theme.Material.Button();
- this.btnPartyMatchForm = new RSBot.Theme.Material.Button();
- this.btnAutoMatchParty = new RSBot.Theme.Material.Button();
- this.btnWhisperPartyMaster = new RSBot.Theme.Material.Button();
- this.btnJoinFormedParty = new RSBot.Theme.Material.Button();
- this.btnPrev = new RSBot.Theme.Material.Button();
- this.btnNext = new RSBot.Theme.Material.Button();
+ this.bottomPartyPanel = new System.Windows.Forms.Panel();
+ this.btnPartyMatchDeleteEntry = new System.Windows.Forms.Button();
+ this.btnPartyMatchChangeEntry = new System.Windows.Forms.Button();
+ this.btnPartyMatchForm = new System.Windows.Forms.Button();
+ this.btnAutoMatchParty = new System.Windows.Forms.Button();
+ this.btnWhisperPartyMaster = new System.Windows.Forms.Button();
+ this.btnJoinFormedParty = new System.Windows.Forms.Button();
+ this.btnPrev = new System.Windows.Forms.Button();
+ this.btnNext = new System.Windows.Forms.Button();
this.lbl_partyPageRange = new System.Windows.Forms.Label();
this.tpPartyBuffing = new System.Windows.Forms.TabPage();
this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.btnAddBuffToMember = new RSBot.Theme.Material.Button();
- this.buttonRemoveCharFromBuffing = new RSBot.Theme.Material.Button();
- this.btnRemoveBuffFromMember = new RSBot.Theme.Material.Button();
- this.listViewPartyMembers = new RSBot.Theme.Controls.ListView();
+ this.btnAddBuffToMember = new System.Windows.Forms.Button();
+ this.buttonRemoveCharFromBuffing = new System.Windows.Forms.Button();
+ this.btnRemoveBuffFromMember = new System.Windows.Forms.Button();
+ this.listViewPartyMembers = new System.Windows.Forms.ListView();
this.chPlayerName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chPlayerLevel = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.groupBox6 = new System.Windows.Forms.GroupBox();
- this.buttonAddGroup = new RSBot.Theme.Material.Button();
- this.buttonRemoveGroup = new RSBot.Theme.Material.Button();
- this.listViewGroups = new RSBot.Theme.Controls.ListView();
+ this.buttonAddGroup = new System.Windows.Forms.Button();
+ this.buttonRemoveGroup = new System.Windows.Forms.Button();
+ this.listViewGroups = new System.Windows.Forms.ListView();
this.columnHeaderGroupName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeaderMembersCount = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.selectedMemberBuffs = new RSBot.Theme.Controls.ListView();
+ this.selectedMemberBuffs = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.listPartyBuffSkills = new RSBot.Theme.Controls.ListView();
+ this.listPartyBuffSkills = new System.Windows.Forms.ListView();
this.columnName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnLimit = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.checkHideLowerLevelSkills = new System.Windows.Forms.CheckBox();
@@ -249,15 +249,9 @@ private void InitializeComponent()
//
// btnLeaveParty
//
- this.btnLeaveParty.Depth = 0;
this.btnLeaveParty.Enabled = false;
- this.btnLeaveParty.Icon = null;
this.btnLeaveParty.Location = new System.Drawing.Point(626, 4);
- this.btnLeaveParty.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnLeaveParty.Name = "btnLeaveParty";
- this.btnLeaveParty.Primary = false;
- this.btnLeaveParty.Raised = false;
- this.btnLeaveParty.SingleColor = System.Drawing.Color.Empty;
this.btnLeaveParty.Size = new System.Drawing.Size(90, 23);
this.btnLeaveParty.TabIndex = 2;
this.btnLeaveParty.Text = "Leave party";
@@ -365,14 +359,8 @@ private void InitializeComponent()
//
// btnRemoveFromAutoParty
//
- this.btnRemoveFromAutoParty.Depth = 0;
- this.btnRemoveFromAutoParty.Icon = null;
this.btnRemoveFromAutoParty.Location = new System.Drawing.Point(8, 304);
- this.btnRemoveFromAutoParty.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnRemoveFromAutoParty.Name = "btnRemoveFromAutoParty";
- this.btnRemoveFromAutoParty.Primary = false;
- this.btnRemoveFromAutoParty.Raised = false;
- this.btnRemoveFromAutoParty.SingleColor = System.Drawing.Color.Empty;
this.btnRemoveFromAutoParty.Size = new System.Drawing.Size(78, 23);
this.btnRemoveFromAutoParty.TabIndex = 10;
this.btnRemoveFromAutoParty.Text = "Remove";
@@ -381,14 +369,8 @@ private void InitializeComponent()
//
// btnAddToAutoParty
//
- this.btnAddToAutoParty.Depth = 0;
- this.btnAddToAutoParty.Icon = null;
this.btnAddToAutoParty.Location = new System.Drawing.Point(92, 304);
- this.btnAddToAutoParty.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnAddToAutoParty.Name = "btnAddToAutoParty";
- this.btnAddToAutoParty.Primary = false;
- this.btnAddToAutoParty.Raised = false;
- this.btnAddToAutoParty.SingleColor = System.Drawing.Color.Empty;
this.btnAddToAutoParty.Size = new System.Drawing.Size(82, 23);
this.btnAddToAutoParty.TabIndex = 10;
this.btnAddToAutoParty.Text = "Add";
@@ -626,14 +608,8 @@ private void InitializeComponent()
//
// btnPartyRefresh
//
- this.btnPartyRefresh.Depth = 0;
- this.btnPartyRefresh.Icon = null;
this.btnPartyRefresh.Location = new System.Drawing.Point(608, 13);
- this.btnPartyRefresh.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnPartyRefresh.Name = "btnPartyRefresh";
- this.btnPartyRefresh.Primary = false;
- this.btnPartyRefresh.Raised = false;
- this.btnPartyRefresh.SingleColor = System.Drawing.Color.Empty;
this.btnPartyRefresh.Size = new System.Drawing.Size(78, 21);
this.btnPartyRefresh.TabIndex = 4;
this.btnPartyRefresh.Text = "Refresh";
@@ -642,14 +618,8 @@ private void InitializeComponent()
//
// btnPartySearch
//
- this.btnPartySearch.Depth = 0;
- this.btnPartySearch.Icon = null;
this.btnPartySearch.Location = new System.Drawing.Point(515, 13);
- this.btnPartySearch.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnPartySearch.Name = "btnPartySearch";
- this.btnPartySearch.Primary = false;
- this.btnPartySearch.Raised = false;
- this.btnPartySearch.SingleColor = System.Drawing.Color.Empty;
this.btnPartySearch.Size = new System.Drawing.Size(77, 21);
this.btnPartySearch.TabIndex = 4;
this.btnPartySearch.Text = "Search";
@@ -779,15 +749,9 @@ private void InitializeComponent()
//
// btnPartyMatchDeleteEntry
//
- this.btnPartyMatchDeleteEntry.Depth = 0;
this.btnPartyMatchDeleteEntry.Enabled = false;
- this.btnPartyMatchDeleteEntry.Icon = null;
this.btnPartyMatchDeleteEntry.Location = new System.Drawing.Point(635, 14);
- this.btnPartyMatchDeleteEntry.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnPartyMatchDeleteEntry.Name = "btnPartyMatchDeleteEntry";
- this.btnPartyMatchDeleteEntry.Primary = false;
- this.btnPartyMatchDeleteEntry.Raised = false;
- this.btnPartyMatchDeleteEntry.SingleColor = System.Drawing.Color.Empty;
this.btnPartyMatchDeleteEntry.Size = new System.Drawing.Size(87, 23);
this.btnPartyMatchDeleteEntry.TabIndex = 16;
this.btnPartyMatchDeleteEntry.Text = "Delete Entry";
@@ -796,15 +760,9 @@ private void InitializeComponent()
//
// btnPartyMatchChangeEntry
//
- this.btnPartyMatchChangeEntry.Depth = 0;
this.btnPartyMatchChangeEntry.Enabled = false;
- this.btnPartyMatchChangeEntry.Icon = null;
this.btnPartyMatchChangeEntry.Location = new System.Drawing.Point(542, 14);
- this.btnPartyMatchChangeEntry.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnPartyMatchChangeEntry.Name = "btnPartyMatchChangeEntry";
- this.btnPartyMatchChangeEntry.Primary = false;
- this.btnPartyMatchChangeEntry.Raised = false;
- this.btnPartyMatchChangeEntry.SingleColor = System.Drawing.Color.Empty;
this.btnPartyMatchChangeEntry.Size = new System.Drawing.Size(87, 23);
this.btnPartyMatchChangeEntry.TabIndex = 15;
this.btnPartyMatchChangeEntry.Text = "Change Entry";
@@ -813,14 +771,8 @@ private void InitializeComponent()
//
// btnPartyMatchForm
//
- this.btnPartyMatchForm.Depth = 0;
- this.btnPartyMatchForm.Icon = null;
this.btnPartyMatchForm.Location = new System.Drawing.Point(446, 14);
- this.btnPartyMatchForm.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnPartyMatchForm.Name = "btnPartyMatchForm";
- this.btnPartyMatchForm.Primary = false;
- this.btnPartyMatchForm.Raised = false;
- this.btnPartyMatchForm.SingleColor = System.Drawing.Color.Empty;
this.btnPartyMatchForm.Size = new System.Drawing.Size(90, 23);
this.btnPartyMatchForm.TabIndex = 14;
this.btnPartyMatchForm.Text = "Form Party";
@@ -829,15 +781,9 @@ private void InitializeComponent()
//
// btnAutoMatchParty
//
- this.btnAutoMatchParty.Depth = 0;
this.btnAutoMatchParty.Enabled = false;
- this.btnAutoMatchParty.Icon = null;
this.btnAutoMatchParty.Location = new System.Drawing.Point(180, 14);
- this.btnAutoMatchParty.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnAutoMatchParty.Name = "btnAutoMatchParty";
- this.btnAutoMatchParty.Primary = false;
- this.btnAutoMatchParty.Raised = false;
- this.btnAutoMatchParty.SingleColor = System.Drawing.Color.Empty;
this.btnAutoMatchParty.Size = new System.Drawing.Size(96, 23);
this.btnAutoMatchParty.TabIndex = 10;
this.btnAutoMatchParty.Text = "Auto Match";
@@ -845,15 +791,9 @@ private void InitializeComponent()
//
// btnWhisperPartyMaster
//
- this.btnWhisperPartyMaster.Depth = 0;
this.btnWhisperPartyMaster.Enabled = false;
- this.btnWhisperPartyMaster.Icon = null;
this.btnWhisperPartyMaster.Location = new System.Drawing.Point(99, 14);
- this.btnWhisperPartyMaster.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnWhisperPartyMaster.Name = "btnWhisperPartyMaster";
- this.btnWhisperPartyMaster.Primary = false;
- this.btnWhisperPartyMaster.Raised = false;
- this.btnWhisperPartyMaster.SingleColor = System.Drawing.Color.Empty;
this.btnWhisperPartyMaster.Size = new System.Drawing.Size(75, 23);
this.btnWhisperPartyMaster.TabIndex = 9;
this.btnWhisperPartyMaster.Text = "Whisper";
@@ -861,14 +801,8 @@ private void InitializeComponent()
//
// btnJoinFormedParty
//
- this.btnJoinFormedParty.Depth = 0;
- this.btnJoinFormedParty.Icon = null;
this.btnJoinFormedParty.Location = new System.Drawing.Point(18, 14);
- this.btnJoinFormedParty.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnJoinFormedParty.Name = "btnJoinFormedParty";
- this.btnJoinFormedParty.Primary = false;
- this.btnJoinFormedParty.Raised = false;
- this.btnJoinFormedParty.SingleColor = System.Drawing.Color.Empty;
this.btnJoinFormedParty.Size = new System.Drawing.Size(75, 23);
this.btnJoinFormedParty.TabIndex = 8;
this.btnJoinFormedParty.Text = "Join Party";
@@ -877,17 +811,11 @@ private void InitializeComponent()
//
// btnPrev
//
- this.btnPrev.Depth = 0;
this.btnPrev.Enabled = false;
this.btnPrev.Font = new System.Drawing.Font("Arial", 11.25F);
this.btnPrev.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.btnPrev.Icon = null;
this.btnPrev.Location = new System.Drawing.Point(315, 14);
- this.btnPrev.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnPrev.Name = "btnPrev";
- this.btnPrev.Primary = false;
- this.btnPrev.Raised = false;
- this.btnPrev.SingleColor = System.Drawing.Color.Empty;
this.btnPrev.Size = new System.Drawing.Size(23, 23);
this.btnPrev.TabIndex = 11;
this.btnPrev.Text = "◀";
@@ -896,17 +824,11 @@ private void InitializeComponent()
//
// btnNext
//
- this.btnNext.Depth = 0;
this.btnNext.Enabled = false;
this.btnNext.Font = new System.Drawing.Font("Arial", 11.25F);
this.btnNext.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.btnNext.Icon = null;
this.btnNext.Location = new System.Drawing.Point(387, 14);
- this.btnNext.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnNext.Name = "btnNext";
- this.btnNext.Primary = false;
- this.btnNext.Raised = false;
- this.btnNext.SingleColor = System.Drawing.Color.Empty;
this.btnNext.Size = new System.Drawing.Size(23, 23);
this.btnNext.TabIndex = 12;
this.btnNext.Text = "▶";
@@ -956,15 +878,9 @@ private void InitializeComponent()
// btnAddBuffToMember
//
this.btnAddBuffToMember.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.btnAddBuffToMember.Depth = 0;
this.btnAddBuffToMember.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnAddBuffToMember.Icon = null;
this.btnAddBuffToMember.Location = new System.Drawing.Point(6, 219);
- this.btnAddBuffToMember.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnAddBuffToMember.Name = "btnAddBuffToMember";
- this.btnAddBuffToMember.Primary = true;
- this.btnAddBuffToMember.Raised = true;
- this.btnAddBuffToMember.SingleColor = System.Drawing.Color.Empty;
this.btnAddBuffToMember.Size = new System.Drawing.Size(75, 21);
this.btnAddBuffToMember.TabIndex = 11;
this.btnAddBuffToMember.Text = "Add Buff";
@@ -974,16 +890,10 @@ private void InitializeComponent()
// buttonRemoveCharFromBuffing
//
this.buttonRemoveCharFromBuffing.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonRemoveCharFromBuffing.Depth = 0;
this.buttonRemoveCharFromBuffing.Font = new System.Drawing.Font("Webdings", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
this.buttonRemoveCharFromBuffing.ForeColor = System.Drawing.Color.Transparent;
- this.buttonRemoveCharFromBuffing.Icon = null;
this.buttonRemoveCharFromBuffing.Location = new System.Drawing.Point(179, 187);
- this.buttonRemoveCharFromBuffing.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonRemoveCharFromBuffing.Name = "buttonRemoveCharFromBuffing";
- this.buttonRemoveCharFromBuffing.Primary = true;
- this.buttonRemoveCharFromBuffing.Raised = true;
- this.buttonRemoveCharFromBuffing.SingleColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.buttonRemoveCharFromBuffing.Size = new System.Drawing.Size(22, 19);
this.buttonRemoveCharFromBuffing.TabIndex = 12;
this.buttonRemoveCharFromBuffing.Text = "r";
@@ -993,15 +903,9 @@ private void InitializeComponent()
// btnRemoveBuffFromMember
//
this.btnRemoveBuffFromMember.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.btnRemoveBuffFromMember.Depth = 0;
this.btnRemoveBuffFromMember.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnRemoveBuffFromMember.Icon = null;
this.btnRemoveBuffFromMember.Location = new System.Drawing.Point(115, 219);
- this.btnRemoveBuffFromMember.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnRemoveBuffFromMember.Name = "btnRemoveBuffFromMember";
- this.btnRemoveBuffFromMember.Primary = true;
- this.btnRemoveBuffFromMember.Raised = true;
- this.btnRemoveBuffFromMember.SingleColor = System.Drawing.Color.Crimson;
this.btnRemoveBuffFromMember.Size = new System.Drawing.Size(86, 21);
this.btnRemoveBuffFromMember.TabIndex = 12;
this.btnRemoveBuffFromMember.Text = "Remove Buff";
@@ -1052,15 +956,9 @@ private void InitializeComponent()
// buttonAddGroup
//
this.buttonAddGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonAddGroup.Depth = 0;
this.buttonAddGroup.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonAddGroup.Icon = null;
this.buttonAddGroup.Location = new System.Drawing.Point(6, 140);
- this.buttonAddGroup.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonAddGroup.Name = "buttonAddGroup";
- this.buttonAddGroup.Primary = true;
- this.buttonAddGroup.Raised = true;
- this.buttonAddGroup.SingleColor = System.Drawing.Color.Empty;
this.buttonAddGroup.Size = new System.Drawing.Size(63, 21);
this.buttonAddGroup.TabIndex = 0;
this.buttonAddGroup.Text = "Create";
@@ -1070,15 +968,9 @@ private void InitializeComponent()
// buttonRemoveGroup
//
this.buttonRemoveGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonRemoveGroup.Depth = 0;
this.buttonRemoveGroup.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonRemoveGroup.Icon = null;
this.buttonRemoveGroup.Location = new System.Drawing.Point(129, 140);
- this.buttonRemoveGroup.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.buttonRemoveGroup.Name = "buttonRemoveGroup";
- this.buttonRemoveGroup.Primary = true;
- this.buttonRemoveGroup.Raised = true;
- this.buttonRemoveGroup.SingleColor = System.Drawing.Color.Crimson;
this.buttonRemoveGroup.Size = new System.Drawing.Size(72, 21);
this.buttonRemoveGroup.TabIndex = 0;
this.buttonRemoveGroup.Text = "Remove";
@@ -1237,14 +1129,14 @@ private void InitializeComponent()
private System.Windows.Forms.TabControl tabMain;
private System.Windows.Forms.TabPage tabCurrentParty;
- private Theme.Controls.ListView listParty;
+ private System.Windows.Forms.ListView listParty;
private System.Windows.Forms.ColumnHeader colMemberName;
private System.Windows.Forms.ColumnHeader colLevel;
private System.Windows.Forms.ColumnHeader colGuild;
private System.Windows.Forms.ColumnHeader colMasteries;
private System.Windows.Forms.Label lblLeader;
private System.Windows.Forms.Label label1;
- private Theme.Material.Button btnLeaveParty;
+ private System.Windows.Forms.Button btnLeaveParty;
private System.Windows.Forms.CheckBox checkCurrentAutoShareItems;
private System.Windows.Forms.CheckBox checkCurrentAutoShareEXP;
private System.Windows.Forms.CheckBox checkCurrentAllowInvitations;
@@ -1259,8 +1151,8 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox checkAutoItemAutoShare;
private System.Windows.Forms.CheckBox checkAutoExpAutoShare;
private System.Windows.Forms.ListBox listAutoParty;
- private Theme.Material.Button btnAddToAutoParty;
- private Theme.Material.Button btnRemoveFromAutoParty;
+ private System.Windows.Forms.Button btnAddToAutoParty;
+ private System.Windows.Forms.Button btnRemoveFromAutoParty;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.CheckBox checkInviteFromList;
private System.Windows.Forms.CheckBox checkInviteAll;
@@ -1269,16 +1161,16 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox checkAcceptAtTrainingPlace;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.GroupBox groupBox3;
- private Theme.Controls.HorizontalPanel bottomPartyPanel;
- private Theme.Material.Button btnPartyMatchDeleteEntry;
- private Theme.Material.Button btnPartyMatchChangeEntry;
- private Theme.Material.Button btnPartyMatchForm;
- private Theme.Material.Button btnAutoMatchParty;
- private Theme.Material.Button btnWhisperPartyMaster;
- private Theme.Material.Button btnJoinFormedParty;
- public Theme.Material.Button btnPrev;
- public Theme.Material.Button btnNext;
- public Theme.Controls.ListView lvPartyMatching;
+ private System.Windows.Forms.Panel bottomPartyPanel;
+ private System.Windows.Forms.Button btnPartyMatchDeleteEntry;
+ private System.Windows.Forms.Button btnPartyMatchChangeEntry;
+ private System.Windows.Forms.Button btnPartyMatchForm;
+ private System.Windows.Forms.Button btnAutoMatchParty;
+ private System.Windows.Forms.Button btnWhisperPartyMaster;
+ private System.Windows.Forms.Button btnJoinFormedParty;
+ public System.Windows.Forms.Button btnPrev;
+ public System.Windows.Forms.Button btnNext;
+ public System.Windows.Forms.ListView lvPartyMatching;
private System.Windows.Forms.ColumnHeader chPartyMatchNo;
private System.Windows.Forms.ColumnHeader chPartyMatchRace;
private System.Windows.Forms.ColumnHeader chPartyMatchName;
@@ -1292,8 +1184,8 @@ private void InitializeComponent()
private System.Windows.Forms.TextBox tbPartySearchName;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
- private Theme.Material.Button btnPartyRefresh;
- private Theme.Material.Button btnPartySearch;
+ private System.Windows.Forms.Button btnPartyRefresh;
+ private System.Windows.Forms.Button btnPartySearch;
private System.Windows.Forms.NumericUpDown nudPartySearchMax;
private System.Windows.Forms.NumericUpDown nudPartySearchMin;
private System.Windows.Forms.Label label6;
@@ -1303,26 +1195,26 @@ private void InitializeComponent()
private System.Windows.Forms.ColumnHeader colLocation;
private System.Windows.Forms.TabPage tpPartyBuffing;
private System.Windows.Forms.GroupBox groupBox1;
- private Theme.Controls.ListView listPartyBuffSkills;
+ private System.Windows.Forms.ListView listPartyBuffSkills;
private System.Windows.Forms.ColumnHeader columnName;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupBox5;
- private Theme.Controls.ListView selectedMemberBuffs;
+ private System.Windows.Forms.ListView selectedMemberBuffs;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.CheckBox checkHideLowerLevelSkills;
private System.Windows.Forms.ColumnHeader columnLimit;
- private Theme.Controls.ListView listViewPartyMembers;
+ private System.Windows.Forms.ListView listViewPartyMembers;
private System.Windows.Forms.ColumnHeader chPlayerName;
private System.Windows.Forms.ColumnHeader chPlayerLevel;
private System.Windows.Forms.GroupBox groupBox6;
- private Theme.Material.Button buttonAddGroup;
- private Theme.Material.Button buttonRemoveGroup;
- private Theme.Controls.ListView listViewGroups;
+ private System.Windows.Forms.Button buttonAddGroup;
+ private System.Windows.Forms.Button buttonRemoveGroup;
+ private System.Windows.Forms.ListView listViewGroups;
private System.Windows.Forms.ColumnHeader columnHeaderGroupName;
private System.Windows.Forms.ColumnHeader columnHeaderMembersCount;
- private Theme.Material.Button btnAddBuffToMember;
- private Theme.Material.Button btnRemoveBuffFromMember;
+ private System.Windows.Forms.Button btnAddBuffToMember;
+ private System.Windows.Forms.Button btnRemoveBuffFromMember;
private System.Windows.Forms.MenuItem menuItemAddToBuffing;
- private Theme.Material.Button buttonRemoveCharFromBuffing;
+ private System.Windows.Forms.Button buttonRemoveCharFromBuffing;
}
}
diff --git a/Plugins/RSBot.Shopping/RSBot.Items.csproj b/Plugins/RSBot.Shopping/RSBot.Items.csproj
index ce498986..bd707db7 100644
--- a/Plugins/RSBot.Shopping/RSBot.Items.csproj
+++ b/Plugins/RSBot.Shopping/RSBot.Items.csproj
@@ -61,11 +61,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Plugins/RSBot.Shopping/Views/Main.Designer.cs b/Plugins/RSBot.Shopping/Views/Main.Designer.cs
index dc6b35c3..e9cc2b5f 100644
--- a/Plugins/RSBot.Shopping/Views/Main.Designer.cs
+++ b/Plugins/RSBot.Shopping/Views/Main.Designer.cs
@@ -35,7 +35,7 @@ private void InitializeComponent()
System.Windows.Forms.ListViewGroup listViewGroup4 = new System.Windows.Forms.ListViewGroup("Weapon trader", System.Windows.Forms.HorizontalAlignment.Left);
System.Windows.Forms.ListViewGroup listViewGroup5 = new System.Windows.Forms.ListViewGroup("Accessory trader", System.Windows.Forms.HorizontalAlignment.Left);
this.comboStore = new System.Windows.Forms.ComboBox();
- this.listShoppingList = new RSBot.Theme.Controls.ListView();
+ this.listShoppingList = new System.Windows.Forms.ListView();
this.colName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colAmount = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.contextShoppingList = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -43,7 +43,7 @@ private void InitializeComponent()
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.menuRemoveItem = new System.Windows.Forms.ToolStripMenuItem();
this.imgShoppingList = new System.Windows.Forms.ImageList(this.components);
- this.listAvailableProducts = new RSBot.Theme.Controls.ListView();
+ this.listAvailableProducts = new System.Windows.Forms.ListView();
this.colAvailableName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.contextAvailableProducts = new System.Windows.Forms.ContextMenuStrip(this.components);
this.menuAddToShoppingList = new System.Windows.Forms.ToolStripMenuItem();
@@ -62,7 +62,7 @@ private void InitializeComponent()
this.checkRepairGear = new System.Windows.Forms.CheckBox();
this.checkEnable = new System.Windows.Forms.CheckBox();
this.tabSellFilter = new System.Windows.Forms.TabPage();
- this.listFilter = new RSBot.Theme.Controls.ListView();
+ this.listFilter = new System.Windows.Forms.ListView();
this.colItemName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colItemLevel = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colGender = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -128,9 +128,9 @@ private void InitializeComponent()
this.panel3 = new System.Windows.Forms.Panel();
this.panel7 = new System.Windows.Forms.Panel();
this.labelResult = new System.Windows.Forms.Label();
- this.btnResetFilter = new RSBot.Theme.Material.Button();
- this.btnSearch = new RSBot.Theme.Material.Button();
- this.btnReload = new RSBot.Theme.Material.Button();
+ this.btnResetFilter = new System.Windows.Forms.Button();
+ this.btnSearch = new System.Windows.Forms.Button();
+ this.btnReload = new System.Windows.Forms.Button();
this.txtSellSearch = new System.Windows.Forms.TextBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.tabPage1 = new System.Windows.Forms.TabPage();
@@ -1144,14 +1144,8 @@ private void InitializeComponent()
//
// btnResetFilter
//
- this.btnResetFilter.Depth = 0;
- this.btnResetFilter.Icon = null;
this.btnResetFilter.Location = new System.Drawing.Point(12, 7);
- this.btnResetFilter.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnResetFilter.Name = "btnResetFilter";
- this.btnResetFilter.Primary = false;
- this.btnResetFilter.Raised = false;
- this.btnResetFilter.SingleColor = System.Drawing.Color.Empty;
this.btnResetFilter.Size = new System.Drawing.Size(96, 23);
this.btnResetFilter.TabIndex = 39;
this.btnResetFilter.Text = "Reset";
@@ -1161,15 +1155,9 @@ private void InitializeComponent()
// btnSearch
//
this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.btnSearch.Depth = 0;
this.btnSearch.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
- this.btnSearch.Icon = null;
this.btnSearch.Location = new System.Drawing.Point(655, 7);
- this.btnSearch.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnSearch.Name = "btnSearch";
- this.btnSearch.Primary = true;
- this.btnSearch.Raised = true;
- this.btnSearch.SingleColor = System.Drawing.Color.CadetBlue;
this.btnSearch.Size = new System.Drawing.Size(75, 23);
this.btnSearch.TabIndex = 21;
this.btnSearch.Text = "Search";
@@ -1178,14 +1166,8 @@ private void InitializeComponent()
//
// btnReload
//
- this.btnReload.Depth = 0;
- this.btnReload.Icon = null;
this.btnReload.Location = new System.Drawing.Point(112, 7);
- this.btnReload.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnReload.Name = "btnReload";
- this.btnReload.Primary = true;
- this.btnReload.Raised = true;
- this.btnReload.SingleColor = System.Drawing.Color.Empty;
this.btnReload.Size = new System.Drawing.Size(137, 23);
this.btnReload.TabIndex = 39;
this.btnReload.Text = "Apply";
@@ -1353,10 +1335,10 @@ private void InitializeComponent()
#endregion
private System.Windows.Forms.ComboBox comboStore;
- private Theme.Controls.ListView listShoppingList;
+ private System.Windows.Forms.ListView listShoppingList;
private System.Windows.Forms.ColumnHeader colName;
private System.Windows.Forms.ColumnHeader colAmount;
- private Theme.Controls.ListView listAvailableProducts;
+ private System.Windows.Forms.ListView listAvailableProducts;
private System.Windows.Forms.ColumnHeader colAvailableName;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.SplitContainer splitContainer1;
@@ -1371,7 +1353,7 @@ private void InitializeComponent()
private System.Windows.Forms.TabPage tabBuyFilter;
private System.Windows.Forms.TabPage tabSellFilter;
private System.Windows.Forms.TextBox txtShopSearch;
- private Theme.Controls.ListView listFilter;
+ private System.Windows.Forms.ListView listFilter;
private System.Windows.Forms.ColumnHeader colItemName;
private System.Windows.Forms.ColumnHeader colItemLevel;
private System.Windows.Forms.ColumnHeader colSell;
@@ -1381,7 +1363,7 @@ private void InitializeComponent()
private System.Windows.Forms.ContextMenuStrip contextList;
private System.Windows.Forms.ToolStripMenuItem btnAddToSell;
private System.Windows.Forms.ToolStripMenuItem btnAddToStore;
- private Theme.Material.Button btnSearch;
+ private System.Windows.Forms.Button btnSearch;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem btnDontSell;
private System.Windows.Forms.ToolStripMenuItem btnDontStore;
@@ -1391,7 +1373,7 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox checkOther;
private System.Windows.Forms.GroupBox groupClothes;
private System.Windows.Forms.GroupBox groupWeapons;
- private Theme.Material.Button btnReload;
+ private System.Windows.Forms.Button btnReload;
private System.Windows.Forms.CheckBox checkBlade;
private System.Windows.Forms.CheckBox checkSword;
private System.Windows.Forms.CheckBox checkSpear;
@@ -1434,7 +1416,7 @@ private void InitializeComponent()
private System.Windows.Forms.ColumnHeader colPickup;
private System.Windows.Forms.CheckBox checkPickupRare;
private System.Windows.Forms.CheckBox checkEnableAbilityPet;
- private Theme.Material.Button btnResetFilter;
+ private System.Windows.Forms.Button btnResetFilter;
private System.Windows.Forms.ImageList imgShoppingListNPC;
private System.Windows.Forms.ImageList imgShoppingList;
private System.Windows.Forms.CheckBox checkShowEquipment;
diff --git a/Plugins/RSBot.Skills/RSBot.Skills.csproj b/Plugins/RSBot.Skills/RSBot.Skills.csproj
index 20f0bc17..979f796f 100644
--- a/Plugins/RSBot.Skills/RSBot.Skills.csproj
+++ b/Plugins/RSBot.Skills/RSBot.Skills.csproj
@@ -57,11 +57,6 @@
RSBot.Core
False
-
- {9e2a3ce3-d977-4e96-9f56-49288cf7d6b3}
- RSBot.Theme
- False
-
diff --git a/Plugins/RSBot.Skills/Views/Main.Designer.cs b/Plugins/RSBot.Skills/Views/Main.Designer.cs
index e83f49d0..705d394a 100644
--- a/Plugins/RSBot.Skills/Views/Main.Designer.cs
+++ b/Plugins/RSBot.Skills/Views/Main.Designer.cs
@@ -29,23 +29,23 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.listAttackingSkills = new RSBot.Theme.Controls.ListView();
+ this.listAttackingSkills = new System.Windows.Forms.ListView();
this.columnName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnLevel = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.label2 = new System.Windows.Forms.Label();
this.comboMonsterType = new System.Windows.Forms.ComboBox();
- this.btnMoveAttackSkillDown = new RSBot.Theme.Material.Button();
- this.btnMoveAttackSkillUp = new RSBot.Theme.Material.Button();
- this.btnRemoveAttackSkill = new RSBot.Theme.Material.Button();
+ this.btnMoveAttackSkillDown = new System.Windows.Forms.Button();
+ this.btnMoveAttackSkillUp = new System.Windows.Forms.Button();
+ this.btnRemoveAttackSkill = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.listBuffs = new RSBot.Theme.Controls.ListView();
+ this.listBuffs = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.btnMoveBuffSkillDown = new RSBot.Theme.Material.Button();
+ this.btnMoveBuffSkillDown = new System.Windows.Forms.Button();
this.comboImbue = new System.Windows.Forms.ComboBox();
- this.btnMoveBuffSkillUp = new RSBot.Theme.Material.Button();
+ this.btnMoveBuffSkillUp = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
- this.btnRemoveBuffSkill = new RSBot.Theme.Material.Button();
+ this.btnRemoveBuffSkill = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
@@ -59,7 +59,7 @@ private void InitializeComponent()
this.checkCastBuffsInTowns = new System.Windows.Forms.CheckBox();
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
- this.listSkills = new RSBot.Theme.Controls.ListView();
+ this.listSkills = new System.Windows.Forms.ListView();
this.colName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colLevel = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.panel1 = new System.Windows.Forms.Panel();
@@ -68,7 +68,7 @@ private void InitializeComponent()
this.checkShowAttacks = new System.Windows.Forms.CheckBox();
this.checkShowBuffs = new System.Windows.Forms.CheckBox();
this.tabPage4 = new System.Windows.Forms.TabPage();
- this.listActiveBuffs = new RSBot.Theme.Controls.ListView();
+ this.listActiveBuffs = new System.Windows.Forms.ListView();
this.colActiveName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.colActiveLevel = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.skillContextMenu = new System.Windows.Forms.ContextMenu();
@@ -158,15 +158,9 @@ private void InitializeComponent()
//
// btnMoveAttackSkillDown
//
- this.btnMoveAttackSkillDown.Depth = 0;
this.btnMoveAttackSkillDown.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
- this.btnMoveAttackSkillDown.Icon = null;
this.btnMoveAttackSkillDown.Location = new System.Drawing.Point(327, 79);
- this.btnMoveAttackSkillDown.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnMoveAttackSkillDown.Name = "btnMoveAttackSkillDown";
- this.btnMoveAttackSkillDown.Primary = true;
- this.btnMoveAttackSkillDown.Raised = true;
- this.btnMoveAttackSkillDown.SingleColor = System.Drawing.Color.LightSlateGray;
this.btnMoveAttackSkillDown.Size = new System.Drawing.Size(24, 24);
this.btnMoveAttackSkillDown.TabIndex = 1;
this.btnMoveAttackSkillDown.Text = "6";
@@ -175,15 +169,9 @@ private void InitializeComponent()
//
// btnMoveAttackSkillUp
//
- this.btnMoveAttackSkillUp.Depth = 0;
this.btnMoveAttackSkillUp.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
- this.btnMoveAttackSkillUp.Icon = null;
this.btnMoveAttackSkillUp.Location = new System.Drawing.Point(327, 49);
- this.btnMoveAttackSkillUp.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnMoveAttackSkillUp.Name = "btnMoveAttackSkillUp";
- this.btnMoveAttackSkillUp.Primary = true;
- this.btnMoveAttackSkillUp.Raised = true;
- this.btnMoveAttackSkillUp.SingleColor = System.Drawing.Color.Empty;
this.btnMoveAttackSkillUp.Size = new System.Drawing.Size(24, 24);
this.btnMoveAttackSkillUp.TabIndex = 1;
this.btnMoveAttackSkillUp.Text = "5";
@@ -192,15 +180,10 @@ private void InitializeComponent()
//
// btnRemoveAttackSkill
//
- this.btnRemoveAttackSkill.Depth = 0;
this.btnRemoveAttackSkill.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
- this.btnRemoveAttackSkill.Icon = null;
- this.btnRemoveAttackSkill.Location = new System.Drawing.Point(327, 19);
- this.btnRemoveAttackSkill.MouseState = RSBot.Theme.IMatMouseState.HOVER;
+
+ this.btnRemoveAttackSkill.Location = new System.Drawing.Point(327, 19);
this.btnRemoveAttackSkill.Name = "btnRemoveAttackSkill";
- this.btnRemoveAttackSkill.Primary = true;
- this.btnRemoveAttackSkill.Raised = true;
- this.btnRemoveAttackSkill.SingleColor = System.Drawing.Color.Red;
this.btnRemoveAttackSkill.Size = new System.Drawing.Size(24, 24);
this.btnRemoveAttackSkill.TabIndex = 1;
this.btnRemoveAttackSkill.Text = "r";
@@ -248,15 +231,9 @@ private void InitializeComponent()
//
// btnMoveBuffSkillDown
//
- this.btnMoveBuffSkillDown.Depth = 0;
this.btnMoveBuffSkillDown.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
- this.btnMoveBuffSkillDown.Icon = null;
this.btnMoveBuffSkillDown.Location = new System.Drawing.Point(327, 79);
- this.btnMoveBuffSkillDown.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnMoveBuffSkillDown.Name = "btnMoveBuffSkillDown";
- this.btnMoveBuffSkillDown.Primary = true;
- this.btnMoveBuffSkillDown.Raised = true;
- this.btnMoveBuffSkillDown.SingleColor = System.Drawing.Color.LightSlateGray;
this.btnMoveBuffSkillDown.Size = new System.Drawing.Size(24, 24);
this.btnMoveBuffSkillDown.TabIndex = 8;
this.btnMoveBuffSkillDown.Text = "6";
@@ -275,15 +252,9 @@ private void InitializeComponent()
//
// btnMoveBuffSkillUp
//
- this.btnMoveBuffSkillUp.Depth = 0;
this.btnMoveBuffSkillUp.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
- this.btnMoveBuffSkillUp.Icon = null;
this.btnMoveBuffSkillUp.Location = new System.Drawing.Point(327, 49);
- this.btnMoveBuffSkillUp.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnMoveBuffSkillUp.Name = "btnMoveBuffSkillUp";
- this.btnMoveBuffSkillUp.Primary = true;
- this.btnMoveBuffSkillUp.Raised = true;
- this.btnMoveBuffSkillUp.SingleColor = System.Drawing.Color.Empty;
this.btnMoveBuffSkillUp.Size = new System.Drawing.Size(24, 24);
this.btnMoveBuffSkillUp.TabIndex = 9;
this.btnMoveBuffSkillUp.Text = "5";
@@ -301,15 +272,9 @@ private void InitializeComponent()
//
// btnRemoveBuffSkill
//
- this.btnRemoveBuffSkill.Depth = 0;
this.btnRemoveBuffSkill.Font = new System.Drawing.Font("Webdings", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2)));
- this.btnRemoveBuffSkill.Icon = null;
this.btnRemoveBuffSkill.Location = new System.Drawing.Point(327, 19);
- this.btnRemoveBuffSkill.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnRemoveBuffSkill.Name = "btnRemoveBuffSkill";
- this.btnRemoveBuffSkill.Primary = true;
- this.btnRemoveBuffSkill.Raised = true;
- this.btnRemoveBuffSkill.SingleColor = System.Drawing.Color.Red;
this.btnRemoveBuffSkill.Size = new System.Drawing.Size(24, 24);
this.btnRemoveBuffSkill.TabIndex = 5;
this.btnRemoveBuffSkill.Text = "r";
@@ -641,12 +606,12 @@ private void InitializeComponent()
#endregion
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2;
- private Theme.Material.Button btnRemoveAttackSkill;
- private Theme.Material.Button btnMoveAttackSkillDown;
- private Theme.Material.Button btnMoveAttackSkillUp;
+ private System.Windows.Forms.Button btnRemoveAttackSkill;
+ private System.Windows.Forms.Button btnMoveAttackSkillDown;
+ private System.Windows.Forms.Button btnMoveAttackSkillUp;
private System.Windows.Forms.ComboBox comboImbue;
private System.Windows.Forms.Label label1;
- private Theme.Material.Button btnRemoveBuffSkill;
+ private System.Windows.Forms.Button btnRemoveBuffSkill;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox comboMonsterType;
private System.Windows.Forms.TabControl tabControl1;
@@ -665,21 +630,21 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox checkShowAttacks;
private System.Windows.Forms.CheckBox checkShowBuffs;
private System.Windows.Forms.CheckBox checkHideLowerLevelSkills;
- private Theme.Controls.ListView listSkills;
+ private System.Windows.Forms.ListView listSkills;
private System.Windows.Forms.ColumnHeader colName;
private System.Windows.Forms.ColumnHeader colLevel;
private System.Windows.Forms.TabPage tabPage4;
- private Theme.Controls.ListView listActiveBuffs;
+ private System.Windows.Forms.ListView listActiveBuffs;
private System.Windows.Forms.ColumnHeader colActiveName;
private System.Windows.Forms.ColumnHeader colActiveLevel;
- private Theme.Material.Button btnMoveBuffSkillDown;
- private Theme.Material.Button btnMoveBuffSkillUp;
+ private System.Windows.Forms.Button btnMoveBuffSkillDown;
+ private System.Windows.Forms.Button btnMoveBuffSkillUp;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
- private Theme.Controls.ListView listAttackingSkills;
+ private System.Windows.Forms.ListView listAttackingSkills;
private System.Windows.Forms.ColumnHeader columnName;
private System.Windows.Forms.ColumnHeader columnLevel;
- private Theme.Controls.ListView listBuffs;
+ private System.Windows.Forms.ListView listBuffs;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ColumnHeader columnHeader2;
private System.Windows.Forms.ContextMenu skillContextMenu;
diff --git a/Plugins/RSBot.Statistics/Views/Main.Designer.cs b/Plugins/RSBot.Statistics/Views/Main.Designer.cs
index b5bd48d1..0d2fd94c 100644
--- a/Plugins/RSBot.Statistics/Views/Main.Designer.cs
+++ b/Plugins/RSBot.Statistics/Views/Main.Designer.cs
@@ -36,11 +36,11 @@ private void InitializeComponent()
this.panelStaticFilters = new System.Windows.Forms.Panel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.panelLiveFilters = new System.Windows.Forms.Panel();
- this.lvStatistics = new RSBot.Theme.Controls.ListView();
+ this.lvStatistics = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.panel1 = new System.Windows.Forms.Panel();
- this.btnReset = new RSBot.Theme.Material.Button();
+ this.btnReset = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -154,14 +154,8 @@ private void InitializeComponent()
//
// btnReset
//
- this.btnReset.Depth = 0;
- this.btnReset.Icon = null;
this.btnReset.Location = new System.Drawing.Point(406, 17);
- this.btnReset.MouseState = RSBot.Theme.IMatMouseState.HOVER;
this.btnReset.Name = "btnReset";
- this.btnReset.Primary = false;
- this.btnReset.Raised = false;
- this.btnReset.SingleColor = System.Drawing.Color.Empty;
this.btnReset.Size = new System.Drawing.Size(75, 23);
this.btnReset.TabIndex = 0;
this.btnReset.Text = "Reset ";
@@ -191,9 +185,9 @@ private void InitializeComponent()
#endregion
private System.Windows.Forms.SplitContainer splitContainer1;
- private Theme.Controls.ListView lvStatistics;
+ private System.Windows.Forms.ListView lvStatistics;
private System.Windows.Forms.Panel panel1;
- private Theme.Material.Button btnReset;
+ private System.Windows.Forms.Button btnReset;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ColumnHeader columnHeader2;
private System.Windows.Forms.GroupBox groupBox1;
diff --git a/RSBot.sln b/RSBot.sln
index 979b50c5..0d752a3e 100644
--- a/RSBot.sln
+++ b/RSBot.sln
@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSBot.Core", "Library\RSBot
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSBot.Pk2", "Library\RSBot.Pk2\RSBot.Pk2.csproj", "{B62C693A-62E0-4D29-8702-DD8B3B6B308B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSBot.Theme", "Library\RSBot.Theme\RSBot.Theme.csproj", "{9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSBot.Chat", "Plugins\RSBot.Chat\RSBot.Chat.csproj", "{10CB2A7E-46CC-4427-986C-D2CCEE919DFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSBot.General", "Plugins\RSBot.General\RSBot.General.csproj", "{1912F216-0ED6-45D5-A54D-6E5DCD3609B2}"
@@ -79,18 +77,6 @@ Global
{B62C693A-62E0-4D29-8702-DD8B3B6B308B}.Release|x64.Build.0 = Release|Any CPU
{B62C693A-62E0-4D29-8702-DD8B3B6B308B}.Release|x86.ActiveCfg = Release|Any CPU
{B62C693A-62E0-4D29-8702-DD8B3B6B308B}.Release|x86.Build.0 = Release|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Debug|x64.ActiveCfg = Debug|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Debug|x64.Build.0 = Debug|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Debug|x86.Build.0 = Debug|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Release|Any CPU.Build.0 = Release|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Release|x64.ActiveCfg = Release|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Release|x64.Build.0 = Release|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Release|x86.ActiveCfg = Release|Any CPU
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3}.Release|x86.Build.0 = Release|Any CPU
{10CB2A7E-46CC-4427-986C-D2CCEE919DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10CB2A7E-46CC-4427-986C-D2CCEE919DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10CB2A7E-46CC-4427-986C-D2CCEE919DFB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -266,7 +252,6 @@ Global
GlobalSection(NestedProjects) = preSolution
{84323C14-EB9F-44D9-8980-89C9F82DB4EE} = {06762F99-9EA8-4E3E-91E8-73F2ED402CFB}
{B62C693A-62E0-4D29-8702-DD8B3B6B308B} = {06762F99-9EA8-4E3E-91E8-73F2ED402CFB}
- {9E2A3CE3-D977-4E96-9F56-49288CF7D6B3} = {06762F99-9EA8-4E3E-91E8-73F2ED402CFB}
{10CB2A7E-46CC-4427-986C-D2CCEE919DFB} = {50ECA1E3-A0CF-4DC6-B0D9-AB5668D17EC3}
{1912F216-0ED6-45D5-A54D-6E5DCD3609B2} = {50ECA1E3-A0CF-4DC6-B0D9-AB5668D17EC3}
{0CD455EA-A75D-4273-BE3E-DA570C783726} = {50ECA1E3-A0CF-4DC6-B0D9-AB5668D17EC3}