diff --git a/AngelLoader/Forms/MainForm.Designer.cs b/AngelLoader/Forms/MainForm.Designer.cs index dd7f01fe6..8f58da29b 100644 --- a/AngelLoader/Forms/MainForm.Designer.cs +++ b/AngelLoader/Forms/MainForm.Designer.cs @@ -91,18 +91,6 @@ private void InitializeComponent() this.AddTagListBox = new System.Windows.Forms.ListBox(); this.MainSplitContainer = new AngelLoader.CustomControls.SplitContainerCustom(); this.TopSplitContainer = new AngelLoader.CustomControls.SplitContainerCustom(); - this.RefreshClearToolStripCustom = new AngelLoader.CustomControls.ToolStripCustom(); - this.FMsListZoomInButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); - this.FMsListZoomOutButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); - this.FMsListResetZoomButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); - this.toolStripSeparatorCustom4 = new AngelLoader.CustomControls.ToolStripSeparatorCustom(); - this.RefreshFromDiskButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); - this.RefreshFiltersButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); - this.ClearFiltersButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); - this.toolStripSeparatorCustom3 = new AngelLoader.CustomControls.ToolStripSeparatorCustom(); - this.ResetLayoutButton = new System.Windows.Forms.Button(); - this.FilterBarScrollRightButton = new System.Windows.Forms.Button(); - this.FilterBarScrollLeftButton = new System.Windows.Forms.Button(); this.FMsDGV = new AngelLoader.CustomControls.DataGridViewCustom(); this.GameTypeColumn = new System.Windows.Forms.DataGridViewImageColumn(); this.InstalledColumn = new System.Windows.Forms.DataGridViewImageColumn(); @@ -141,12 +129,24 @@ private void InitializeComponent() this.FilterByTagsButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); this.toolStripSeparator4 = new AngelLoader.CustomControls.ToolStripSeparatorCustom(); this.FilterByFinishedButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); - this.FilterShowUnsupportedButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); this.FilterByUnfinishedButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); this.toolStripSeparator1 = new AngelLoader.CustomControls.ToolStripSeparatorCustom(); this.FilterByRatingButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); this.FilterByRatingLabel = new System.Windows.Forms.ToolStripLabel(); this.toolStripSeparator3 = new AngelLoader.CustomControls.ToolStripSeparatorCustom(); + this.FilterShowUnsupportedButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); + this.RefreshClearToolStripCustom = new AngelLoader.CustomControls.ToolStripCustom(); + this.FMsListZoomInButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); + this.FMsListZoomOutButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); + this.FMsListResetZoomButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); + this.toolStripSeparatorCustom4 = new AngelLoader.CustomControls.ToolStripSeparatorCustom(); + this.RefreshFromDiskButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); + this.RefreshFiltersButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); + this.ClearFiltersButton = new AngelLoader.CustomControls.ToolStripButtonCustom(); + this.toolStripSeparatorCustom3 = new AngelLoader.CustomControls.ToolStripSeparatorCustom(); + this.ResetLayoutButton = new System.Windows.Forms.Button(); + this.FilterBarScrollRightButton = new System.Windows.Forms.Button(); + this.FilterBarScrollLeftButton = new System.Windows.Forms.Button(); this.GamesTabControl = new System.Windows.Forms.TabControl(); this.Thief1TabPage = new System.Windows.Forms.TabPage(); this.Thief2TabPage = new System.Windows.Forms.TabPage(); @@ -244,13 +244,13 @@ private void InitializeComponent() this.TopSplitContainer.Panel1.SuspendLayout(); this.TopSplitContainer.Panel2.SuspendLayout(); this.TopSplitContainer.SuspendLayout(); - this.RefreshClearToolStripCustom.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.FMsDGV)).BeginInit(); this.FiltersFlowLayoutPanel.SuspendLayout(); this.FilterGamesLeftSepToolStripCustom.SuspendLayout(); this.FilterGameButtonsToolStrip.SuspendLayout(); this.TitleAuthorSep.SuspendLayout(); this.FilterIconButtonsToolStripCustom.SuspendLayout(); + this.RefreshClearToolStripCustom.SuspendLayout(); this.GamesTabControl.SuspendLayout(); this.TopRightTabControl.SuspendLayout(); this.StatisticsTabPage.SuspendLayout(); @@ -839,12 +839,12 @@ private void InitializeComponent() // TopSplitContainer.Panel1 // this.TopSplitContainer.Panel1.BackColor = System.Drawing.SystemColors.Control; + this.TopSplitContainer.Panel1.Controls.Add(this.FilterBarScrollRightButton); + this.TopSplitContainer.Panel1.Controls.Add(this.FilterBarScrollLeftButton); this.TopSplitContainer.Panel1.Controls.Add(this.FMsDGV); this.TopSplitContainer.Panel1.Controls.Add(this.FiltersFlowLayoutPanel); this.TopSplitContainer.Panel1.Controls.Add(this.RefreshClearToolStripCustom); this.TopSplitContainer.Panel1.Controls.Add(this.ResetLayoutButton); - this.TopSplitContainer.Panel1.Controls.Add(this.FilterBarScrollRightButton); - this.TopSplitContainer.Panel1.Controls.Add(this.FilterBarScrollLeftButton); this.TopSplitContainer.Panel1.Controls.Add(this.GamesTabControl); // // TopSplitContainer.Panel2 @@ -857,170 +857,6 @@ private void InitializeComponent() this.TopSplitContainer.SplitterDistance = 1116; this.TopSplitContainer.TabIndex = 32; // - // RefreshClearToolStripCustom - // - this.RefreshClearToolStripCustom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.RefreshClearToolStripCustom.BackColor = System.Drawing.SystemColors.Control; - this.RefreshClearToolStripCustom.CanOverflow = false; - this.RefreshClearToolStripCustom.Dock = System.Windows.Forms.DockStyle.None; - this.RefreshClearToolStripCustom.GripMargin = new System.Windows.Forms.Padding(0); - this.RefreshClearToolStripCustom.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.RefreshClearToolStripCustom.ImageScalingSize = new System.Drawing.Size(22, 22); - this.RefreshClearToolStripCustom.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FMsListZoomInButton, - this.FMsListZoomOutButton, - this.FMsListResetZoomButton, - this.toolStripSeparatorCustom4, - this.RefreshFromDiskButton, - this.RefreshFiltersButton, - this.ClearFiltersButton, - this.toolStripSeparatorCustom3}); - this.RefreshClearToolStripCustom.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - this.RefreshClearToolStripCustom.Location = new System.Drawing.Point(916, 0); - this.RefreshClearToolStripCustom.Name = "RefreshClearToolStripCustom"; - this.RefreshClearToolStripCustom.PaddingDrawNudge = 0; - this.RefreshClearToolStripCustom.Size = new System.Drawing.Size(169, 26); - this.RefreshClearToolStripCustom.TabIndex = 12; - // - // FMsListZoomInButton - // - this.FMsListZoomInButton.AutoSize = false; - this.FMsListZoomInButton.BackColor = System.Drawing.SystemColors.Control; - this.FMsListZoomInButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FMsListZoomInButton.Image = global::AngelLoader.Properties.Resources.ZoomIn; - this.FMsListZoomInButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.FMsListZoomInButton.Margin = new System.Windows.Forms.Padding(0); - this.FMsListZoomInButton.Name = "FMsListZoomInButton"; - this.FMsListZoomInButton.Size = new System.Drawing.Size(25, 25); - this.FMsListZoomInButton.Click += new System.EventHandler(this.FMsListZoomInButton_Click); - // - // FMsListZoomOutButton - // - this.FMsListZoomOutButton.AutoSize = false; - this.FMsListZoomOutButton.BackColor = System.Drawing.SystemColors.Control; - this.FMsListZoomOutButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FMsListZoomOutButton.Image = global::AngelLoader.Properties.Resources.ZoomOut; - this.FMsListZoomOutButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.FMsListZoomOutButton.Margin = new System.Windows.Forms.Padding(0); - this.FMsListZoomOutButton.Name = "FMsListZoomOutButton"; - this.FMsListZoomOutButton.Size = new System.Drawing.Size(25, 25); - this.FMsListZoomOutButton.Click += new System.EventHandler(this.FMsListZoomOutButton_Click); - // - // FMsListResetZoomButton - // - this.FMsListResetZoomButton.AutoSize = false; - this.FMsListResetZoomButton.BackColor = System.Drawing.SystemColors.Control; - this.FMsListResetZoomButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FMsListResetZoomButton.Image = global::AngelLoader.Properties.Resources.ZoomReset; - this.FMsListResetZoomButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.FMsListResetZoomButton.Margin = new System.Windows.Forms.Padding(0); - this.FMsListResetZoomButton.Name = "FMsListResetZoomButton"; - this.FMsListResetZoomButton.Size = new System.Drawing.Size(25, 25); - this.FMsListResetZoomButton.Click += new System.EventHandler(this.FMsListResetZoomButton_Click); - // - // toolStripSeparatorCustom4 - // - this.toolStripSeparatorCustom4.AutoSize = false; - this.toolStripSeparatorCustom4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.toolStripSeparatorCustom4.Name = "toolStripSeparatorCustom4"; - this.toolStripSeparatorCustom4.Size = new System.Drawing.Size(6, 26); - // - // RefreshFromDiskButton - // - this.RefreshFromDiskButton.AutoSize = false; - this.RefreshFromDiskButton.BackColor = System.Drawing.SystemColors.Control; - this.RefreshFromDiskButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RefreshFromDiskButton.Image = global::AngelLoader.Properties.Resources.FindNewFMs_21; - this.RefreshFromDiskButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.RefreshFromDiskButton.Margin = new System.Windows.Forms.Padding(0); - this.RefreshFromDiskButton.Name = "RefreshFromDiskButton"; - this.RefreshFromDiskButton.Size = new System.Drawing.Size(25, 25); - this.RefreshFromDiskButton.ToolTipText = "Refresh from disk"; - this.RefreshFromDiskButton.Click += new System.EventHandler(this.RefreshFromDiskButton_Click); - // - // RefreshFiltersButton - // - this.RefreshFiltersButton.AutoSize = false; - this.RefreshFiltersButton.BackColor = System.Drawing.SystemColors.Control; - this.RefreshFiltersButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RefreshFiltersButton.Image = global::AngelLoader.Properties.Resources.Refresh; - this.RefreshFiltersButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.RefreshFiltersButton.Margin = new System.Windows.Forms.Padding(0); - this.RefreshFiltersButton.Name = "RefreshFiltersButton"; - this.RefreshFiltersButton.Size = new System.Drawing.Size(25, 25); - this.RefreshFiltersButton.ToolTipText = "Refresh filtered list"; - this.RefreshFiltersButton.Click += new System.EventHandler(this.RefreshFiltersButton_Click); - // - // ClearFiltersButton - // - this.ClearFiltersButton.AutoSize = false; - this.ClearFiltersButton.BackColor = System.Drawing.SystemColors.Control; - this.ClearFiltersButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.ClearFiltersButton.Image = global::AngelLoader.Properties.Resources.ClearFilters; - this.ClearFiltersButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.ClearFiltersButton.Margin = new System.Windows.Forms.Padding(0); - this.ClearFiltersButton.Name = "ClearFiltersButton"; - this.ClearFiltersButton.Size = new System.Drawing.Size(25, 25); - this.ClearFiltersButton.ToolTipText = "Clear filters"; - this.ClearFiltersButton.Click += new System.EventHandler(this.ClearFiltersButton_Click); - // - // toolStripSeparatorCustom3 - // - this.toolStripSeparatorCustom3.AutoSize = false; - this.toolStripSeparatorCustom3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.toolStripSeparatorCustom3.Name = "toolStripSeparatorCustom3"; - this.toolStripSeparatorCustom3.Size = new System.Drawing.Size(6, 26); - // - // ResetLayoutButton - // - this.ResetLayoutButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.ResetLayoutButton.BackgroundImage = global::AngelLoader.Properties.Resources.ResetLayout; - this.ResetLayoutButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.ResetLayoutButton.FlatAppearance.BorderSize = 0; - this.ResetLayoutButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ResetLayoutButton.Location = new System.Drawing.Point(1090, 2); - this.ResetLayoutButton.Name = "ResetLayoutButton"; - this.ResetLayoutButton.Size = new System.Drawing.Size(21, 21); - this.ResetLayoutButton.TabIndex = 13; - this.MainToolTip.SetToolTip(this.ResetLayoutButton, "Reset layout"); - this.ResetLayoutButton.UseVisualStyleBackColor = true; - this.ResetLayoutButton.Click += new System.EventHandler(this.ResetLayoutButton_Click); - // - // FilterBarScrollRightButton - // - this.FilterBarScrollRightButton.BackgroundImage = global::AngelLoader.Properties.Resources.ArrowRightSmall; - this.FilterBarScrollRightButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.FilterBarScrollRightButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.FilterBarScrollRightButton.Location = new System.Drawing.Point(1088, 56); - this.FilterBarScrollRightButton.Name = "FilterBarScrollRightButton"; - this.FilterBarScrollRightButton.Size = new System.Drawing.Size(14, 24); - this.FilterBarScrollRightButton.TabIndex = 10; - this.FilterBarScrollRightButton.UseVisualStyleBackColor = true; - this.FilterBarScrollRightButton.Visible = false; - this.FilterBarScrollRightButton.EnabledChanged += new System.EventHandler(this.FilterBarScrollButtons_EnabledChanged); - this.FilterBarScrollRightButton.VisibleChanged += new System.EventHandler(this.FilterBarScrollButtons_VisibleChanged); - this.FilterBarScrollRightButton.Click += new System.EventHandler(this.FilterBarScrollButtons_Click); - this.FilterBarScrollRightButton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FilterBarScrollButtons_MouseDown); - this.FilterBarScrollRightButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.FilterBarScrollLeftButton_MouseUp); - // - // FilterBarScrollLeftButton - // - this.FilterBarScrollLeftButton.BackgroundImage = global::AngelLoader.Properties.Resources.ArrowLeftSmall; - this.FilterBarScrollLeftButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.FilterBarScrollLeftButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.FilterBarScrollLeftButton.Location = new System.Drawing.Point(1072, 56); - this.FilterBarScrollLeftButton.Name = "FilterBarScrollLeftButton"; - this.FilterBarScrollLeftButton.Size = new System.Drawing.Size(14, 24); - this.FilterBarScrollLeftButton.TabIndex = 2; - this.FilterBarScrollLeftButton.UseVisualStyleBackColor = true; - this.FilterBarScrollLeftButton.Visible = false; - this.FilterBarScrollLeftButton.EnabledChanged += new System.EventHandler(this.FilterBarScrollButtons_EnabledChanged); - this.FilterBarScrollLeftButton.VisibleChanged += new System.EventHandler(this.FilterBarScrollButtons_VisibleChanged); - this.FilterBarScrollLeftButton.Click += new System.EventHandler(this.FilterBarScrollButtons_Click); - this.FilterBarScrollLeftButton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FilterBarScrollButtons_MouseDown); - this.FilterBarScrollLeftButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.FilterBarScrollLeftButton_MouseUp); - // // FMsDGV // this.FMsDGV.AllowUserToAddRows = false; @@ -1390,7 +1226,7 @@ private void InitializeComponent() this.FilterIconButtonsToolStripCustom.Location = new System.Drawing.Point(471, 0); this.FilterIconButtonsToolStripCustom.Name = "FilterIconButtonsToolStripCustom"; this.FilterIconButtonsToolStripCustom.PaddingDrawNudge = 0; - this.FilterIconButtonsToolStripCustom.Size = new System.Drawing.Size(328, 26); + this.FilterIconButtonsToolStripCustom.Size = new System.Drawing.Size(297, 26); this.FilterIconButtonsToolStripCustom.TabIndex = 3; // // toolStripSeparator5 @@ -1489,20 +1325,6 @@ private void InitializeComponent() this.FilterByFinishedButton.ToolTipText = "Finished"; this.FilterByFinishedButton.Click += new System.EventHandler(this.FilterByFinishedButton_Click); // - // FilterShowJunkButton - // - this.FilterShowUnsupportedButton.AutoSize = false; - this.FilterShowUnsupportedButton.BackColor = System.Drawing.SystemColors.Control; - this.FilterShowUnsupportedButton.CheckOnClick = true; - this.FilterShowUnsupportedButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.FilterShowUnsupportedButton.Image = ((System.Drawing.Image)(resources.GetObject("FilterShowJunkButton.Image"))); - this.FilterShowUnsupportedButton.ImageTransparentColor = System.Drawing.Color.Magenta; - this.FilterShowUnsupportedButton.Margin = new System.Windows.Forms.Padding(0); - this.FilterShowUnsupportedButton.Name = "FilterShowUnsupportedButton"; - this.FilterShowUnsupportedButton.Size = new System.Drawing.Size(25, 25); - this.FilterShowUnsupportedButton.ToolTipText = "Unfinished"; - this.FilterShowUnsupportedButton.Click += new System.EventHandler(this.FilterShowJunkButton_Click); - // // FilterByUnfinishedButton // this.FilterByUnfinishedButton.AutoSize = false; @@ -1551,6 +1373,184 @@ private void InitializeComponent() this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(6, 26); // + // FilterShowUnsupportedButton + // + this.FilterShowUnsupportedButton.AutoSize = false; + this.FilterShowUnsupportedButton.BackColor = System.Drawing.SystemColors.Control; + this.FilterShowUnsupportedButton.CheckOnClick = true; + this.FilterShowUnsupportedButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.FilterShowUnsupportedButton.Image = global::AngelLoader.Properties.Resources.Show_Unsupported; + this.FilterShowUnsupportedButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.FilterShowUnsupportedButton.Margin = new System.Windows.Forms.Padding(0); + this.FilterShowUnsupportedButton.Name = "FilterShowUnsupportedButton"; + this.FilterShowUnsupportedButton.Size = new System.Drawing.Size(25, 25); + this.FilterShowUnsupportedButton.ToolTipText = "Unfinished"; + this.FilterShowUnsupportedButton.Click += new System.EventHandler(this.FilterShowJunkButton_Click); + // + // RefreshClearToolStripCustom + // + this.RefreshClearToolStripCustom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.RefreshClearToolStripCustom.BackColor = System.Drawing.SystemColors.Control; + this.RefreshClearToolStripCustom.CanOverflow = false; + this.RefreshClearToolStripCustom.Dock = System.Windows.Forms.DockStyle.None; + this.RefreshClearToolStripCustom.GripMargin = new System.Windows.Forms.Padding(0); + this.RefreshClearToolStripCustom.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.RefreshClearToolStripCustom.ImageScalingSize = new System.Drawing.Size(22, 22); + this.RefreshClearToolStripCustom.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.FMsListZoomInButton, + this.FMsListZoomOutButton, + this.FMsListResetZoomButton, + this.toolStripSeparatorCustom4, + this.RefreshFromDiskButton, + this.RefreshFiltersButton, + this.ClearFiltersButton, + this.toolStripSeparatorCustom3}); + this.RefreshClearToolStripCustom.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; + this.RefreshClearToolStripCustom.Location = new System.Drawing.Point(916, 0); + this.RefreshClearToolStripCustom.Name = "RefreshClearToolStripCustom"; + this.RefreshClearToolStripCustom.PaddingDrawNudge = 0; + this.RefreshClearToolStripCustom.Size = new System.Drawing.Size(169, 26); + this.RefreshClearToolStripCustom.TabIndex = 12; + // + // FMsListZoomInButton + // + this.FMsListZoomInButton.AutoSize = false; + this.FMsListZoomInButton.BackColor = System.Drawing.SystemColors.Control; + this.FMsListZoomInButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.FMsListZoomInButton.Image = global::AngelLoader.Properties.Resources.ZoomIn; + this.FMsListZoomInButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.FMsListZoomInButton.Margin = new System.Windows.Forms.Padding(0); + this.FMsListZoomInButton.Name = "FMsListZoomInButton"; + this.FMsListZoomInButton.Size = new System.Drawing.Size(25, 25); + this.FMsListZoomInButton.Click += new System.EventHandler(this.FMsListZoomInButton_Click); + // + // FMsListZoomOutButton + // + this.FMsListZoomOutButton.AutoSize = false; + this.FMsListZoomOutButton.BackColor = System.Drawing.SystemColors.Control; + this.FMsListZoomOutButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.FMsListZoomOutButton.Image = global::AngelLoader.Properties.Resources.ZoomOut; + this.FMsListZoomOutButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.FMsListZoomOutButton.Margin = new System.Windows.Forms.Padding(0); + this.FMsListZoomOutButton.Name = "FMsListZoomOutButton"; + this.FMsListZoomOutButton.Size = new System.Drawing.Size(25, 25); + this.FMsListZoomOutButton.Click += new System.EventHandler(this.FMsListZoomOutButton_Click); + // + // FMsListResetZoomButton + // + this.FMsListResetZoomButton.AutoSize = false; + this.FMsListResetZoomButton.BackColor = System.Drawing.SystemColors.Control; + this.FMsListResetZoomButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.FMsListResetZoomButton.Image = global::AngelLoader.Properties.Resources.ZoomReset; + this.FMsListResetZoomButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.FMsListResetZoomButton.Margin = new System.Windows.Forms.Padding(0); + this.FMsListResetZoomButton.Name = "FMsListResetZoomButton"; + this.FMsListResetZoomButton.Size = new System.Drawing.Size(25, 25); + this.FMsListResetZoomButton.Click += new System.EventHandler(this.FMsListResetZoomButton_Click); + // + // toolStripSeparatorCustom4 + // + this.toolStripSeparatorCustom4.AutoSize = false; + this.toolStripSeparatorCustom4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.toolStripSeparatorCustom4.Name = "toolStripSeparatorCustom4"; + this.toolStripSeparatorCustom4.Size = new System.Drawing.Size(6, 26); + // + // RefreshFromDiskButton + // + this.RefreshFromDiskButton.AutoSize = false; + this.RefreshFromDiskButton.BackColor = System.Drawing.SystemColors.Control; + this.RefreshFromDiskButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RefreshFromDiskButton.Image = global::AngelLoader.Properties.Resources.FindNewFMs_21; + this.RefreshFromDiskButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.RefreshFromDiskButton.Margin = new System.Windows.Forms.Padding(0); + this.RefreshFromDiskButton.Name = "RefreshFromDiskButton"; + this.RefreshFromDiskButton.Size = new System.Drawing.Size(25, 25); + this.RefreshFromDiskButton.ToolTipText = "Refresh from disk"; + this.RefreshFromDiskButton.Click += new System.EventHandler(this.RefreshFromDiskButton_Click); + // + // RefreshFiltersButton + // + this.RefreshFiltersButton.AutoSize = false; + this.RefreshFiltersButton.BackColor = System.Drawing.SystemColors.Control; + this.RefreshFiltersButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RefreshFiltersButton.Image = global::AngelLoader.Properties.Resources.Refresh; + this.RefreshFiltersButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.RefreshFiltersButton.Margin = new System.Windows.Forms.Padding(0); + this.RefreshFiltersButton.Name = "RefreshFiltersButton"; + this.RefreshFiltersButton.Size = new System.Drawing.Size(25, 25); + this.RefreshFiltersButton.ToolTipText = "Refresh filtered list"; + this.RefreshFiltersButton.Click += new System.EventHandler(this.RefreshFiltersButton_Click); + // + // ClearFiltersButton + // + this.ClearFiltersButton.AutoSize = false; + this.ClearFiltersButton.BackColor = System.Drawing.SystemColors.Control; + this.ClearFiltersButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.ClearFiltersButton.Image = global::AngelLoader.Properties.Resources.ClearFilters; + this.ClearFiltersButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.ClearFiltersButton.Margin = new System.Windows.Forms.Padding(0); + this.ClearFiltersButton.Name = "ClearFiltersButton"; + this.ClearFiltersButton.Size = new System.Drawing.Size(25, 25); + this.ClearFiltersButton.ToolTipText = "Clear filters"; + this.ClearFiltersButton.Click += new System.EventHandler(this.ClearFiltersButton_Click); + // + // toolStripSeparatorCustom3 + // + this.toolStripSeparatorCustom3.AutoSize = false; + this.toolStripSeparatorCustom3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.toolStripSeparatorCustom3.Name = "toolStripSeparatorCustom3"; + this.toolStripSeparatorCustom3.Size = new System.Drawing.Size(6, 26); + // + // ResetLayoutButton + // + this.ResetLayoutButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ResetLayoutButton.BackgroundImage = global::AngelLoader.Properties.Resources.ResetLayout; + this.ResetLayoutButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.ResetLayoutButton.FlatAppearance.BorderSize = 0; + this.ResetLayoutButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.ResetLayoutButton.Location = new System.Drawing.Point(1090, 2); + this.ResetLayoutButton.Name = "ResetLayoutButton"; + this.ResetLayoutButton.Size = new System.Drawing.Size(21, 21); + this.ResetLayoutButton.TabIndex = 13; + this.MainToolTip.SetToolTip(this.ResetLayoutButton, "Reset layout"); + this.ResetLayoutButton.UseVisualStyleBackColor = true; + this.ResetLayoutButton.Click += new System.EventHandler(this.ResetLayoutButton_Click); + // + // FilterBarScrollRightButton + // + this.FilterBarScrollRightButton.BackgroundImage = global::AngelLoader.Properties.Resources.ArrowRightSmall; + this.FilterBarScrollRightButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.FilterBarScrollRightButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.FilterBarScrollRightButton.Location = new System.Drawing.Point(1088, 56); + this.FilterBarScrollRightButton.Name = "FilterBarScrollRightButton"; + this.FilterBarScrollRightButton.Size = new System.Drawing.Size(14, 24); + this.FilterBarScrollRightButton.TabIndex = 10; + this.FilterBarScrollRightButton.UseVisualStyleBackColor = true; + this.FilterBarScrollRightButton.Visible = false; + this.FilterBarScrollRightButton.EnabledChanged += new System.EventHandler(this.FilterBarScrollButtons_EnabledChanged); + this.FilterBarScrollRightButton.VisibleChanged += new System.EventHandler(this.FilterBarScrollButtons_VisibleChanged); + this.FilterBarScrollRightButton.Click += new System.EventHandler(this.FilterBarScrollButtons_Click); + this.FilterBarScrollRightButton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FilterBarScrollButtons_MouseDown); + this.FilterBarScrollRightButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.FilterBarScrollLeftButton_MouseUp); + // + // FilterBarScrollLeftButton + // + this.FilterBarScrollLeftButton.BackgroundImage = global::AngelLoader.Properties.Resources.ArrowLeftSmall; + this.FilterBarScrollLeftButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.FilterBarScrollLeftButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.FilterBarScrollLeftButton.Location = new System.Drawing.Point(1072, 56); + this.FilterBarScrollLeftButton.Name = "FilterBarScrollLeftButton"; + this.FilterBarScrollLeftButton.Size = new System.Drawing.Size(14, 24); + this.FilterBarScrollLeftButton.TabIndex = 2; + this.FilterBarScrollLeftButton.UseVisualStyleBackColor = true; + this.FilterBarScrollLeftButton.Visible = false; + this.FilterBarScrollLeftButton.EnabledChanged += new System.EventHandler(this.FilterBarScrollButtons_EnabledChanged); + this.FilterBarScrollLeftButton.VisibleChanged += new System.EventHandler(this.FilterBarScrollButtons_VisibleChanged); + this.FilterBarScrollLeftButton.Click += new System.EventHandler(this.FilterBarScrollButtons_Click); + this.FilterBarScrollLeftButton.MouseDown += new System.Windows.Forms.MouseEventHandler(this.FilterBarScrollButtons_MouseDown); + this.FilterBarScrollLeftButton.MouseUp += new System.Windows.Forms.MouseEventHandler(this.FilterBarScrollLeftButton_MouseUp); + // // GamesTabControl // this.GamesTabControl.Controls.Add(this.Thief1TabPage); @@ -2530,8 +2530,6 @@ private void InitializeComponent() this.TopSplitContainer.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.TopSplitContainer)).EndInit(); this.TopSplitContainer.ResumeLayout(false); - this.RefreshClearToolStripCustom.ResumeLayout(false); - this.RefreshClearToolStripCustom.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.FMsDGV)).EndInit(); this.FiltersFlowLayoutPanel.ResumeLayout(false); this.FiltersFlowLayoutPanel.PerformLayout(); @@ -2543,6 +2541,8 @@ private void InitializeComponent() this.TitleAuthorSep.PerformLayout(); this.FilterIconButtonsToolStripCustom.ResumeLayout(false); this.FilterIconButtonsToolStripCustom.PerformLayout(); + this.RefreshClearToolStripCustom.ResumeLayout(false); + this.RefreshClearToolStripCustom.PerformLayout(); this.GamesTabControl.ResumeLayout(false); this.TopRightTabControl.ResumeLayout(false); this.StatisticsTabPage.ResumeLayout(false); diff --git a/AngelLoader/Forms/MainForm.cs b/AngelLoader/Forms/MainForm.cs index b3076016b..ec929c07e 100644 --- a/AngelLoader/Forms/MainForm.cs +++ b/AngelLoader/Forms/MainForm.cs @@ -395,9 +395,6 @@ public void Init() StatisticsTabPage; InstallUninstallFMButton.Visible = !Config.HideUninstallButton; - ShowFMsListZoomButtons(!Config.HideFMListZoomButtons); - - ChangeGameOrganization(); #endregion @@ -421,6 +418,11 @@ public void Init() private void MainForm_Load(object sender, EventArgs e) { ZoomFMsDGV(ZoomFMsDGVType.ZoomToHeightOnly, Config.FMsListFontSizeInPoints); + // Not sure if this needs to go here, but it involves control sizes so... + ChangeGameOrganization(); + // This has to go here because it depends on the width of a control and those don't get properly set + // until the Load event fires + ShowFMsListZoomButtons(!Config.HideFMListZoomButtons); } private async void MainForm_Shown(object sender, EventArgs e) diff --git a/AngelLoader/Forms/MainForm.resx b/AngelLoader/Forms/MainForm.resx index b7c4d55ff..5eb4cc15e 100644 --- a/AngelLoader/Forms/MainForm.resx +++ b/AngelLoader/Forms/MainForm.resx @@ -130,66 +130,66 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG - DQAAAk1TRnQBSQFMAgEBAwEAASQBFAEkARQBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC+ + DQAAAk1TRnQBSQFMAgEBAwEAASwBFAEsARQBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEgBgABEB4AAwQBBgNCAXQDTgGZA1UBsQNaAcoDVQG1A0wBkQNGAYADHAEnKAADDQER A0oBiwNQAZoDHgErGAADAwEEA1MBrQNXAb0DTQGWA18B4ANQAZ9wAAMjATMDVwHoAwAB/wMAAf8DAAH/ - AwAB/wMAAf8DAAH/AwAB/wMAAf8DPQFqGAADDAEQAwQBBgQAAyoBQQEAAQ0BlwH/AwAB/wNAAXAMAAMD + AwAB/wMAAf8DAAH/AwAB/wMAAf8DPQFqGAADDAEQAwQBBgQAAyoBQQEAAQwBlwH/AwAB/wNAAXAMAAMD BAQBBQQAAwQBBgGGAYsBAAH/AckBzQEAAf8BkAGWAQAB/wGqAboBAAH/A1kBxwMtAUYDGAEiAycBOwM4 AV4DQgF0Az8BbgM4AV4DBwEKTAADFwEgARMBLwFGAf4DAAH/A1kBxAEjAVUBIQH7AwAB/wIAAZwB/wMA - Af8DAAH/A1oB5ANBAfkDAAH/A0MBdwwAAwkBDANQAZ8DWQHJAzwBaANGAYEDWQHPAQABlQHKAf8CAAEH - Af8DWQHXA0IBdgMyAVEDUwGwA0UBfgMSARkIAAMrAUMDYQHiAv8BCAH/A1sB2QE+AUMBDQH+A1sB0ANa - AdgDXgHaAwAB/wMAAf8DAAH/A1cB3wMVAR1MAANYAdECAAEJAf8DSgGMA1kBzAMAAf8DAAH/AgABmAH/ + Af8DAAH/A1oB5ANBAfkDAAH/A0MBdwwAAwkBDANQAZ8DWQHJAzwBaANGAYEDWQHPAQABlQHKAf8CAAEG + Af8DWQHXA0IBdgMyAVEDUwGwA0UBfgMSARkIAAMrAUMDYQHiAv8BBwH/A1sB2QE+AUMBDQH+A1sB0ANa + AdgDXgHaAwAB/wMAAf8DAAH/A1cB3wMVAR1MAANYAdECAAEIAf8DSgGMA1kBzAMAAf8DAAH/AgABmAH/ AgABlgH/A0AB/QE+AUEBPgH4A1ABpANRAfcDAAH/AyEBMQgAAx8BLAEAAY4BpwH/AgABmgH/AwAB/wEA AZQBvQH/AQABzgL/AQABsQHeAf8BAAGYAdIB/wEAAYUBygH/AwAB/wMrAfwBAAGnAcgB/wNYAe8DHgEr DAADRQF9AbwBwQEAAf8DVQG0A00BlgNIAYUDWgHbA1YBswNCAXUDTQGVAcYBzQEAAf8DVQHqAxkBI0gA - AzMBUwMAAf8DXwHgAy4BSAFVAVwBVQHqAwAB/wIAAQ4B/wMAAf8DAAH/AykB+gMAAf8DRgGBA04BlwIA - ARAB/wNTAbAMAANEAXsBAAGyAdgB/wEAAbcB9QH/AQAB0QH5Af8BAAGZAZ4B/wEAAbMBzwH/AQABjgGt - Af8BBwGyAccB/wEAAdcC/wEAAesC/wEAAZ0BoQH/A08BmwMNARIMAANGAYABxQHJAQAB/wNQAZ4DJAE1 + AzMBUwMAAf8DXwHgAy4BSAFVAVwBVQHqAwAB/wIAAQ0B/wMAAf8DAAH/AykB+gMAAf8DRgGBA04BlwIA + AQ8B/wNTAbAMAANEAXsBAAGyAdgB/wEAAbcB9QH/AQAB0QH5Af8BAAGZAZ4B/wEAAbMBzwH/AQABjgGt + Af8BBgGyAccB/wEAAdcC/wEAAesC/wEAAZ0BoQH/A08BmwMNARIMAANGAYABxQHJAQAB/wNQAZ4DJAE1 A1UBugNZAewDXgHaAzwBaAM1AVYBwQHHAQAB/wNYAeMDGAEiSAADVwG9AwAB/wNcAdQDHQEqA1kBwwMA - Af8DQAH9AgABvAH/AwAB/wMAAf8DAAH/AycBOwM1AVYCAAEOAf8CIQEjAfsDEwEaCAADUAGdAQABrQHr - Af8BAAGhAcoB/wMAAf8DAAH/AQABlAG3Af8BAAEOAYIB/wENAgAB/wEBAZkBnwH/AQAB6AL/AwAB/wNL + Af8DQAH9AgABvAH/AwAB/wMAAf8DAAH/AycBOwM1AVYCAAENAf8CIQEjAfsDEwEaCAADUAGdAQABrQHr + Af8BAAGhAcoB/wMAAf8DAAH/AQABlAG3Af8BAAENAYIB/wEMAgAB/wEAAZkBnwH/AQAB6AL/AwAB/wNL AY4DBAEGDAADSAGEAboBvwEAAf8DXAHcAWUBbQFRAfcB2AHoAQAB/wG3AboBAAH/AdwB4QEAAf8DAAH/ - A1kBwwHBAcYBAAH/A1cB3wMYASFIAANdAe0CAAEKAf8DKwH8A0QBfAM9AWkCTQEyAfoBKQIyAfsBTQEp + A1kBwwHBAcYBAAH/A1cB3wMYASFIAANdAe0CAAEJAf8DKwH8A0QBfAM9AWkCTQEyAfoBKQIyAfsBTQEp AU0B+gEbASABTAH+AysB/ANSAaYEAAM+AWsDAAH/AwAB/wM3AVsDAQECAzkBXwEAAYEBpAH/AQABtAHu - Af8DAAH/AwAB/wMAAf8BAAGMAbgB/wIAARAB/wGCAgAB/wMAAf8BAAG4Ac4B/wEAAYUBxAH/A1gB3QM5 + Af8DAAH/AwAB/wMAAf8BAAGMAbgB/wIAAQ8B/wGCAgAB/wMAAf8BAAG4Ac4B/wEAAYUBxAH/A1gB3QM5 AWADFAEcCAADRwGDAZUBmwEAAf8DAAH/AdsB6wEAAf8DVAGvAxABFQJTAU8BpQHDAcoBAAH/A1wB5wGo - AbABAAH/A1sB4QMaASVIAANIAfYBAAEDAZoB/wMAAf8DAAH/A1QBqwNaAdUDAAH/A0gB9gEiAU8BFgH+ - A1cB6ANZAdcDOwFlA0oBigIAAYgB/wEAAQEBnwH/Az4BbANeAdoDAAH/AQABsgHjAf8BAAGOAakB/wMA - Af8BEwEHAQAB/wMAAf8BAAGRAcMB/wMAAf8BBgIAAf8DAAH/AQABAQEAAf8BAAGwAe4B/wIAAQQB/wMA - Af8DTQGWCAADRwGDAREBhgEAAf8B1wHcAQAB/wENAQ8BAAH/A1ABnQMaASUDUwGsAcIBzgEAAf8DWwHZ - AaABqgEAAf8DWAHpAx0BKkgAA1EB9wIAAQcB/wI+AVwB+ANeAeUBPgFcAT4B+AMAAf8DSAH2AykB+gMr - AfwBIQEyASEB+wNXAb0DKAE9A1kB1wIAAZIB/wMAAf8DPQFqAQABDAGGAf8BAAGoAdIB/wEAAdIC/wIA - AYQB/wMAAf8DAAH/AwAB/wEAAYoBwQH/AgABBAH/AwAB/wMAAf8DAAH/AQABvAH2Af8BAAGqAd4B/wEA - AQ0BmQH/A1IBqAgAA0IBdgGHAZMBAAH/AVgBWQFBAfkB3gHhAQkB/wERARQBAAH/AQIBCQEAAf8BzgHg - AQAB/wJeAVsB2QNBAXMBqwG0AQAB/wNdAe0DFQEdSAADWQHsAgABkgH/AQABiQG4Af8DXwHgA0gBhAMp - AT8DTgGYAkcBagH5AwAB/wNFAX0EAANMAZICAAGJAf8CAAGcAf8DAAH/AzQBVAMYASEDRwGCAQABwAHo - Af8CAAGEAf8DAAH/AQ4BAgEAAf8DAAH/AQABpAHIAf8CAAEKAf8DAAH/AwAB/wMAAf8BAAG6AfkB/wNU - Ae4DQQFzAxcBIAgAA1ABnQGgAasBAAH/A1oBzQNZAcQCbQFRAfcBgwGLAQAB/wNeAeUDPAFoAzkBXwGr - AbEBAAH/A0wB8wM6AWEDGAEiAwkBDEAAA1YBtgEAAQIBmAH/AwAB/wIAAYgB/wNYAd0DNARUAa4BlwGp - Ad0B/wJZAV8B+wNHAYMDTwGlAwAB/wIAAQkB/wMAAf8CKQFNAfoDDwEUBwABAQFZAmQB7AEAAaEB5gH/ - AwAB/wGCAgAB/wENAgAB/wEAAYwBuAH/AgABDQH/ARECAAH/AwAB/wEAAQwBvQH/AQABlgHAAf8DVQGy - AwMBBAQAAxkBIwNaAdMBhAGGAQAB/wHRAdcBAAH/AlwBPgH4A1cB3wNUAe4DUQH3A14B5QNYAeMBXgFf - ASkB/gHRAdcBAAH/AXQBeAEmAf4BUAFTARAB/gNUAe4DKgFAQAADLwFKAwAB/wMAAf8BAAEKAZ8B/wEA - AYEBtgH/AwAB/wNMAfMDAAH/Aj4BXAH4A00B+gEAAYQBsgH/AwAB/wMAAf8CAAESAf8DUgGmDAADQgF1 - AQAB4wL/AQABlAHMAf8DAAH/AwAB/wEAAYABsQH/AwAB/wMAAf8CAAGOAf8BAAG5AfsB/wMAAf8DSwGO - AxEBFwQAAyUBNwEEAQgBAAH/AdsB3AGOAf8B+AH7AZ0B/wGlAagBAAH/Al8BMgH7AZcBmgEAAf8CWQFC - AfUBkAGSAQAB/wGkAacBAAH/AmIBWAHvAe0B8gGOAf8ByQHNAQAB/wGgAaUBAAH/A1oB2AMUARtEAANX - AcUDAAH/AwAB/wMAAf8CAAGFAf8BAAEQAaoB/wIAAQgB/wEAAYABmwH/AQABjgG4Af8DAAH/AgABCwH/ - AQABDgG0Af8BKQJNAfoDEgEZCAADGAEhAVoCXQHKAQAB5QH6Af8BAAP/AQABxAH3Af8CAAGUAf8BAAGN - AboB/wIAAZcB/wEAARMBwgH/AQAB0QL/AQABygHuAf8CAAGHAf8DWgHkAyABLwgAAwIBAwNMAZMBvAHG - AQAB/wNTAbADXQHiAwAB/wNTAfEDAAH/AzgBXgNRAaAC/wEIAf8DAAH/A1cBvwMWAR5IAAMNARIDVQHq - AwAB/wMAAf8BAAEJAZwB/wMAAf8BAAEDAY8B/wMAAf8CAAEBAf8DAAH/AQABCAGkAf8CAAGGAf8DLQFF - DAADHwEtAQABlQGsAf8BAAGAAZIB/wNRAaEDXAHqAQAB4gH4Af8BAAHeAfMB/wEAAcoB8wH/AQABpgHI - Af8DVgG7A1YBuwEAAa8B0AH/A1YBvAMKAQ4MAAMmATkDWQHMAyUBNwNSAakDUQGgA1MBrANUAa8DQgF2 - An8BbAH+AbQBuAEAAf8BuwHHAQAB/wNTAfEDMQFPTAADFQEdA1kBxwMAAf8DAAH/AwAB/wIAAQsB/wMA - Af8DAAH/AgABkQH/Al0BYQHiAy0BRRQAAyYBOAMyAVEEAAMLAQ8DRAF7AQAB7AL/AQABggGUAf8DSQGJ - AwQBBQMDAQQDNAFUAw0BESwAAlwBWAHRAckB0gEAAf8DSwGPAm0BUQH3AZsBqAEAAf8DPQFqVAADOwFj - A1YBvgNOAfADUwHxAlMBZAHxA1oBzQNDAXcDBgEIKAADEAEVAVMCZAHxA18B4EAAA0QBeQNPAaUEAANG - AYEDVgHBAw8BFEQAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAHgAQ8B/AE/ - AQMB/wIAAcABBwHkATkBAAEDAgABgAEDAYABAQGAAQMCAAGAAQEBgAEBAcABAwMAAQEBwAEBAcABAwQA - AcABAQHAAQMDAAEQAgABwAEDBgABwAEDBgABwAEDAwABIAIAAcAFAAGAAQEFAAEBAcABAQQAAYABAQGA - AQEBgAEBAgABgAEDAYABAQHAAQECAAHAAQcByAEDAf8BgQIAAfABDwH8AX8B/wGRAgAL + AbABAAH/A1sB4QMaASVIAANIAfYBAAECAZoB/wMAAf8DAAH/A1QBqwNaAdUDAAH/A0gB9gEiAU8BFgH+ + A1cB6ANZAdcDOwFlA0oBigIAAYgB/wIAAZ8B/wM+AWwDXgHaAwAB/wEAAbIB4wH/AQABjgGpAf8DAAH/ + ARIBBgEAAf8DAAH/AQABkQHDAf8DAAH/AQUCAAH/AwAB/wMAAf8BAAGwAe4B/wIAAQMB/wMAAf8DTQGW + CAADRwGDARABhgEAAf8B1wHcAQAB/wEMAQ4BAAH/A1ABnQMaASUDUwGsAcIBzgEAAf8DWwHZAaABqgEA + Af8DWAHpAx0BKkgAA1EB9wIAAQYB/wI+AVwB+ANeAeUBPgFcAT4B+AMAAf8DSAH2AykB+gMrAfwBIQEy + ASEB+wNXAb0DKAE9A1kB1wIAAZIB/wMAAf8DPQFqAQABCwGGAf8BAAGoAdIB/wEAAdIC/wIAAYQB/wMA + Af8DAAH/AwAB/wEAAYoBwQH/AgABAwH/AwAB/wMAAf8DAAH/AQABvAH2Af8BAAGqAd4B/wEAAQwBmQH/ + A1IBqAgAA0IBdgGHAZMBAAH/AVgBWQFBAfkB3gHhAQgB/wEQARMBAAH/AQEBCAEAAf8BzgHgAQAB/wJe + AVsB2QNBAXMBqwG0AQAB/wNdAe0DFQEdSAADWQHsAgABkgH/AQABiQG4Af8DXwHgA0gBhAMpAT8DTgGY + AkcBagH5AwAB/wNFAX0EAANMAZICAAGJAf8CAAGcAf8DAAH/AzQBVAMYASEDRwGCAQABwAHoAf8CAAGE + Af8DAAH/AQ0BAQEAAf8DAAH/AQABpAHIAf8CAAEJAf8DAAH/AwAB/wMAAf8BAAG6AfkB/wNUAe4DQQFz + AxcBIAgAA1ABnQGgAasBAAH/A1oBzQNZAcQCbQFRAfcBgwGLAQAB/wNeAeUDPAFoAzkBXwGrAbEBAAH/ + A0wB8wM6AWEDGAEiAwkBDEAAA1YBtgEAAQEBmAH/AwAB/wIAAYgB/wNYAd0DNARUAa4BlwGpAd0B/wJZ + AV8B+wNHAYMDTwGlAwAB/wIAAQgB/wMAAf8CKQFNAfoDDwEUBwABAQFZAmQB7AEAAaEB5gH/AwAB/wGC + AgAB/wEMAgAB/wEAAYwBuAH/AgABDAH/ARACAAH/AwAB/wEAAQsBvQH/AQABlgHAAf8DVQGyAwMBBAQA + AxkBIwNaAdMBhAGGAQAB/wHRAdcBAAH/AlwBPgH4A1cB3wNUAe4DUQH3A14B5QNYAeMBXgFfASkB/gHR + AdcBAAH/AXQBeAEmAf4BUAFTARAB/gNUAe4DKgFAQAADLwFKAwAB/wMAAf8BAAEJAZ8B/wEAAYEBtgH/ + AwAB/wNMAfMDAAH/Aj4BXAH4A00B+gEAAYQBsgH/AwAB/wMAAf8CAAERAf8DUgGmDAADQgF1AQAB4wL/ + AQABlAHMAf8DAAH/AwAB/wEAAYABsQH/AwAB/wMAAf8CAAGOAf8BAAG5AfsB/wMAAf8DSwGOAxEBFwQA + AyUBNwEDAQcBAAH/AdsB3AGOAf8B+AH7AZ0B/wGlAagBAAH/Al8BMgH7AZcBmgEAAf8CWQFCAfUBkAGS + AQAB/wGkAacBAAH/AmIBWAHvAe0B8gGOAf8ByQHNAQAB/wGgAaUBAAH/A1oB2AMUARtEAANXAcUDAAH/ + AwAB/wMAAf8CAAGFAf8BAAEPAaoB/wIAAQcB/wEAAYABmwH/AQABjgG4Af8DAAH/AgABCgH/AQABDQG0 + Af8BKQJNAfoDEgEZCAADGAEhAVoCXQHKAQAB5QH6Af8BAAP/AQABxAH3Af8CAAGUAf8BAAGNAboB/wIA + AZcB/wEAARIBwgH/AQAB0QL/AQABygHuAf8CAAGHAf8DWgHkAyABLwgAAwIBAwNMAZMBvAHGAQAB/wNT + AbADXQHiAwAB/wNTAfEDAAH/AzgBXgNRAaAC/wEHAf8DAAH/A1cBvwMWAR5IAAMNARIDVQHqAwAB/wMA + Af8BAAEIAZwB/wMAAf8BAAECAY8B/wMAAf8DAAH/AwAB/wEAAQcBpAH/AgABhgH/Ay0BRQwAAx8BLQEA + AZUBrAH/AQABgAGSAf8DUQGhA1wB6gEAAeIB+AH/AQAB3gHzAf8BAAHKAfMB/wEAAaYByAH/A1YBuwNW + AbsBAAGvAdAB/wNWAbwDCgEODAADJgE5A1kBzAMlATcDUgGpA1EBoANTAawDVAGvA0IBdgJ/AWwB/gG0 + AbgBAAH/AbsBxwEAAf8DUwHxAzEBT0wAAxUBHQNZAccDAAH/AwAB/wMAAf8CAAEKAf8DAAH/AwAB/wIA + AZEB/wJdAWEB4gMtAUUUAAMmATgDMgFRBAADCwEPA0QBewEAAewC/wEAAYIBlAH/A0kBiQMEAQUDAwEE + AzQBVAMNAREsAAJcAVgB0QHJAdIBAAH/A0sBjwJtAVEB9wGbAagBAAH/Az0BalQAAzsBYwNWAb4DTgHw + A1MB8QJTAWQB8QNaAc0DQwF3AwYBCCgAAxABFQFTAmQB8QNfAeBAAANEAXkDTwGlBAADRgGBA1YBwQMP + ARREAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAB4AEPAfwBPwEDAf8CAAHA + AQcB5AE5AQABAwIAAYABAwGAAQEBgAEDAgABgAEBAYABAQHAAQMDAAEBAcABAQHAAQMEAAHAAQEBwAED + AwABEAIAAcABAwYAAcABAwYAAcABAwMAASACAAHABQABgAEBBQABAQHAAQEEAAGAAQEBgAEBAYABAQIA + AYABAwGAAQEBwAEBAgABwAEHAcgBAwH/AYECAAHwAQ8B/AF/Af8BkQIACw== @@ -252,41 +252,24 @@ 897, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABUAAAAVCAYAAACpF6WWAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAURSURBVDhPlZQLTFNXGMcbJz7i0qFCSZ+0pcXyEmxL6RgP - QaXQEmGzoIgKshawqFMRseJjOMmYE53LNtwcm4CPqCgIFZVOmeIjqDA11iFjkzkBC4JKJ0Ts+O/2trBo - stcv+Sfnfvd+v5x7zzmX8iru6lU1s8tuIt/QjAvNt3HlevNw0anr1oRvLw2ziurhHZpa6nj0vzGJ45/8 - 2pr9mF5y61fd0ca2qmume3U3W9o3G5rvz97bcG9caecAu9aCyCXpp+Pj1YWalKV7lmozv4pK0h6fLpZF - OjR2jCyfwHMS34xiqXjtTiFrxQ7a65p82uTMdc7UZdnOVF0+nbq8ePLEjIQxE1Lo24935FqBq0RsDBEp - IxKYmPGlQ0ehHHP2V5lkXrAkCGGNFWJYJYCVyAulAENKD7yIEuAPtQeG1CKcpzkns6muHjHljTjUNgiz - 2YxfegdQaBqEVJlU7FBSKDeyeT2Wy3R0n2TBXMVC9wl7bOPeWhYGzjPQmseHeaEAD8L88xxtTqtz1hsq - f36ENxfpngcwhXqRSDTVcY9C+a2O2Q84Q5cSipSFM9HZxATuuyB3eTAUCgWa77BhPstEd7wQLVLvzbYe - N3d3rtjPpzcsSgWOYBr83TgqUjZCexXzqbWRhqxFYaQkIS4S7y4IIce27CoSwnKKkL4jRJt8OikloM+L - je/YUXsJQanvmVlUyhRH3U57JfPJ8FUaLNcY0Gjt4pEcOSBCcSkbz2pekU6gcCLCI83qJWkIkAaDy2bP - J+sjPKxkPHnURsMXO7jYsHHGqDAtLQQffMjDyXoGBg2E9G0hbss9SSl7vI9H3FxFX2HVWUiTdQ/93d2d - SdkI9w8xHw9ZXHB0m/dLs7RFr5Xjea8LOiuIhSOkrcG+W2w94yk0fnRMtDlJo4N3oAwSum88KRuhvZr5 - +G4Vd1T00UoJqgqmjV7nbwrAE2Jn2GZKLBQppfJYgapZc55vPWSAbHFWl2CKgErKRmirYPa1GtxJQd6W - IJSVclBWxsGZ055kbW3eDAxUs9AzT4g7MhEp5dF83VRK1T1t7kb4yULhw+IqSNkIPXX0vsctrvimgIuD - 5RwcO8BGRbk9m/R8HCQWCQ10PJrviW65/fUJYoWuzsRxXQZ6QHAXn0J5w1G303mY0fcMU3DdyESLkdjo - 5xi4e5YBEzE21TEA61Ripkw8mOb3Uz0lfKythxs6a9ueI9VPTb2D2FpR36/S5ZiEQq9QUmjDIPde8eNc - r8LbC7yzz0S7qo2h4+adCJ+YcPitCYn75E6JJUFOi0q5k0a3DEO9vqnoKdBDnnw7+wetEAWHaB2P/IUv - jeZGDUrZyZ21IUcersmMUaRnpsRnpSfHZGmUSk2SpzJ+/Vjt7i7pTWD5d2345GAtLl9pRO3lH7Dq62r4 - iMWxDtXLMCN0zXQjkNUBfD/smAZBJfEr0rQBUxsA3vs1wy7EiVocG1N4ibjHS1rd5Gj/ezzDgtYEqTUl - qsTU3ampaZ9lZCzbq4hLXCeOVq8SzYzLZVGp5JFMT9PWGAcAiU7fSlyOsdX+F15crrvMz49lG0v9/Pj6 - os/bu/qf4diFq8hp6kZIYdWQmCmOCAsLm6FQxi4mm/6NTR9vrymoMGJhQXG/flcxLt64QX6W34mUEJl5 - 6y6U+i39n5Ydwa59ZR2Otn8mShQzRxounS2RSJz4dDpn6ep1F883NqHcYLSsrLmGgOTsBh6x0FKplC+T - BUf8CX0qtUQWLjQhAAAAAElFTkSuQmCC - - 642, 56 1293, 17 + + 986, 56 + + + 440, 56 + + + 853, 56 + + + 897, 17 + 299, 17