From ed729a7282cd9f7c22190fe8024b89b7f562ed4f Mon Sep 17 00:00:00 2001 From: Terry MacDonald Date: Tue, 31 Aug 2021 12:05:42 +1200 Subject: [PATCH] Updated DisplayProfileForm and ShortcutForm --- .../UIForms/ShortcutForm.Designer.cs | 126 ++++++++++-------- displaymagician/uiforms/displayprofileform.cs | 1 + 2 files changed, 72 insertions(+), 55 deletions(-) diff --git a/DisplayMagician/UIForms/ShortcutForm.Designer.cs b/DisplayMagician/UIForms/ShortcutForm.Designer.cs index 059a328..af0d0b4 100644 --- a/DisplayMagician/UIForms/ShortcutForm.Designer.cs +++ b/DisplayMagician/UIForms/ShortcutForm.Designer.cs @@ -41,6 +41,7 @@ namespace DisplayMagician.UIForms this.lbl_profile_shown_subtitle = new System.Windows.Forms.Label(); this.lbl_profile_shown = new System.Windows.Forms.Label(); this.ilv_saved_profiles = new Manina.Windows.Forms.ImageListView(); + this.dv_profile = new DisplayMagicianShared.UserControls.DisplayView(); this.tabp_audio = new System.Windows.Forms.TabPage(); this.lbl_no_active_capture_devices = new System.Windows.Forms.Label(); this.lbl_no_active_audio_devices = new System.Windows.Forms.Label(); @@ -71,6 +72,7 @@ namespace DisplayMagician.UIForms this.btn_add_new_start_program = new System.Windows.Forms.Button(); this.flp_start_programs = new System.Windows.Forms.FlowLayoutPanel(); this.tabp_game = new System.Windows.Forms.TabPage(); + this.btn_find_examples_game = new System.Windows.Forms.Button(); this.lbl_no_game_libraries = new System.Windows.Forms.Label(); this.p_standalone = new System.Windows.Forms.Panel(); this.cbx_exe_priority = new System.Windows.Forms.ComboBox(); @@ -118,8 +120,7 @@ namespace DisplayMagician.UIForms this.cb_autosuggest = new System.Windows.Forms.CheckBox(); this.btn_hotkey = new System.Windows.Forms.Button(); this.lbl_hotkey_assigned = new System.Windows.Forms.Label(); - this.dv_profile = new DisplayMagicianShared.UserControls.DisplayView(); - this.btn_find_examples_game = new System.Windows.Forms.Button(); + this.lbl_game_library = new System.Windows.Forms.Label(); this.tabc_shortcut.SuspendLayout(); this.tabp_display.SuspendLayout(); this.tabp_audio.SuspendLayout(); @@ -151,7 +152,7 @@ namespace DisplayMagician.UIForms this.btn_save.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_save.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_save.ForeColor = System.Drawing.Color.White; - this.btn_save.Location = new System.Drawing.Point(560, 778); + this.btn_save.Location = new System.Drawing.Point(560, 806); this.btn_save.Name = "btn_save"; this.btn_save.Size = new System.Drawing.Size(120, 40); this.btn_save.TabIndex = 6; @@ -167,7 +168,7 @@ namespace DisplayMagician.UIForms this.btn_cancel.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown; this.btn_cancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_cancel.ForeColor = System.Drawing.Color.White; - this.btn_cancel.Location = new System.Drawing.Point(1008, 793); + this.btn_cancel.Location = new System.Drawing.Point(1008, 821); this.btn_cancel.Name = "btn_cancel"; this.btn_cancel.Size = new System.Drawing.Size(94, 25); this.btn_cancel.TabIndex = 5; @@ -206,7 +207,7 @@ namespace DisplayMagician.UIForms this.tabc_shortcut.Name = "tabc_shortcut"; this.tabc_shortcut.SelectedIndex = 0; this.tabc_shortcut.ShowToolTips = true; - this.tabc_shortcut.Size = new System.Drawing.Size(1090, 654); + this.tabc_shortcut.Size = new System.Drawing.Size(1090, 682); this.tabc_shortcut.TabIndex = 28; this.tabc_shortcut.Click += new System.EventHandler(this.tabc_shortcut_VisibleChanged); // @@ -271,6 +272,23 @@ namespace DisplayMagician.UIForms this.ilv_saved_profiles.View = Manina.Windows.Forms.View.HorizontalStrip; this.ilv_saved_profiles.ItemClick += new Manina.Windows.Forms.ItemClickEventHandler(this.ilv_saved_profiles_ItemClick); // + // dv_profile + // + this.dv_profile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dv_profile.BackColor = System.Drawing.Color.DimGray; + this.dv_profile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dv_profile.Font = new System.Drawing.Font("Consolas", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dv_profile.ForeColor = System.Drawing.Color.MidnightBlue; + this.dv_profile.Location = new System.Drawing.Point(0, 0); + this.dv_profile.Margin = new System.Windows.Forms.Padding(18); + this.dv_profile.Name = "dv_profile"; + this.dv_profile.PaddingX = 100; + this.dv_profile.PaddingY = 100; + this.dv_profile.Profile = null; + this.dv_profile.Size = new System.Drawing.Size(1082, 467); + this.dv_profile.TabIndex = 23; + // // tabp_audio // this.tabp_audio.BackColor = System.Drawing.Color.Black; @@ -685,10 +703,26 @@ namespace DisplayMagician.UIForms this.tabp_game.Location = new System.Drawing.Point(4, 32); this.tabp_game.Name = "tabp_game"; this.tabp_game.Padding = new System.Windows.Forms.Padding(3); - this.tabp_game.Size = new System.Drawing.Size(1082, 618); + this.tabp_game.Size = new System.Drawing.Size(1082, 646); this.tabp_game.TabIndex = 2; this.tabp_game.Text = "4. Choose Game to start"; // + // btn_find_examples_game + // + this.btn_find_examples_game.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btn_find_examples_game.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed; + this.btn_find_examples_game.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown; + this.btn_find_examples_game.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btn_find_examples_game.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btn_find_examples_game.ForeColor = System.Drawing.Color.White; + this.btn_find_examples_game.Location = new System.Drawing.Point(953, 45); + this.btn_find_examples_game.Name = "btn_find_examples_game"; + this.btn_find_examples_game.Size = new System.Drawing.Size(117, 25); + this.btn_find_examples_game.TabIndex = 41; + this.btn_find_examples_game.Text = "Show me &Examples"; + this.btn_find_examples_game.UseVisualStyleBackColor = true; + this.btn_find_examples_game.Click += new System.EventHandler(this.btn_find_examples_game_Click); + // // lbl_no_game_libraries // this.lbl_no_game_libraries.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -698,11 +732,13 @@ namespace DisplayMagician.UIForms this.lbl_no_game_libraries.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F); this.lbl_no_game_libraries.ForeColor = System.Drawing.Color.White; this.lbl_no_game_libraries.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lbl_no_game_libraries.Location = new System.Drawing.Point(375, 262); + this.lbl_no_game_libraries.Location = new System.Drawing.Point(255, 281); this.lbl_no_game_libraries.Name = "lbl_no_game_libraries"; - this.lbl_no_game_libraries.Size = new System.Drawing.Size(280, 22); + this.lbl_no_game_libraries.Size = new System.Drawing.Size(613, 22); this.lbl_no_game_libraries.TabIndex = 34; - this.lbl_no_game_libraries.Text = "No supported game libraries detected!"; + this.lbl_no_game_libraries.Text = "No supported game libraries detected! (Steam, Origin, Uplay, Epic or GOG supporte" + + "d)"; + this.lbl_no_game_libraries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbl_no_game_libraries.Visible = false; // // p_standalone @@ -903,6 +939,7 @@ namespace DisplayMagician.UIForms // // p_game // + this.p_game.Controls.Add(this.lbl_game_library); this.p_game.Controls.Add(this.cbx_game_priority); this.p_game.Controls.Add(this.ilv_games); this.p_game.Controls.Add(this.cb_wait_alternative_game); @@ -918,7 +955,7 @@ namespace DisplayMagician.UIForms this.p_game.Dock = System.Windows.Forms.DockStyle.Bottom; this.p_game.Location = new System.Drawing.Point(3, 292); this.p_game.Name = "p_game"; - this.p_game.Size = new System.Drawing.Size(1076, 323); + this.p_game.Size = new System.Drawing.Size(1076, 351); this.p_game.TabIndex = 7; // // cbx_game_priority @@ -926,7 +963,7 @@ namespace DisplayMagician.UIForms this.cbx_game_priority.AllowDrop = true; this.cbx_game_priority.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbx_game_priority.FormattingEnabled = true; - this.cbx_game_priority.Location = new System.Drawing.Point(150, 43); + this.cbx_game_priority.Location = new System.Drawing.Point(150, 78); this.cbx_game_priority.Name = "cbx_game_priority"; this.cbx_game_priority.Size = new System.Drawing.Size(179, 28); this.cbx_game_priority.TabIndex = 29; @@ -937,7 +974,7 @@ namespace DisplayMagician.UIForms | System.Windows.Forms.AnchorStyles.Right))); this.ilv_games.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ilv_games.IntegralScroll = true; - this.ilv_games.Location = new System.Drawing.Point(0, 97); + this.ilv_games.Location = new System.Drawing.Point(0, 125); this.ilv_games.Name = "ilv_games"; this.ilv_games.PersistentCacheDirectory = ""; this.ilv_games.PersistentCacheSize = ((long)(100)); @@ -950,7 +987,7 @@ namespace DisplayMagician.UIForms // cb_wait_alternative_game // this.cb_wait_alternative_game.AutoSize = true; - this.cb_wait_alternative_game.Location = new System.Drawing.Point(555, 45); + this.cb_wait_alternative_game.Location = new System.Drawing.Point(555, 44); this.cb_wait_alternative_game.Name = "cb_wait_alternative_game"; this.cb_wait_alternative_game.Size = new System.Drawing.Size(229, 24); this.cb_wait_alternative_game.TabIndex = 27; @@ -963,7 +1000,7 @@ namespace DisplayMagician.UIForms this.btn_choose_alternative_game.Enabled = false; this.btn_choose_alternative_game.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_choose_alternative_game.ForeColor = System.Drawing.Color.White; - this.btn_choose_alternative_game.Location = new System.Drawing.Point(983, 42); + this.btn_choose_alternative_game.Location = new System.Drawing.Point(983, 44); this.btn_choose_alternative_game.Name = "btn_choose_alternative_game"; this.btn_choose_alternative_game.Size = new System.Drawing.Size(85, 27); this.btn_choose_alternative_game.TabIndex = 26; @@ -974,7 +1011,7 @@ namespace DisplayMagician.UIForms // txt_alternative_game // this.txt_alternative_game.Enabled = false; - this.txt_alternative_game.Location = new System.Drawing.Point(788, 43); + this.txt_alternative_game.Location = new System.Drawing.Point(788, 45); this.txt_alternative_game.Name = "txt_alternative_game"; this.txt_alternative_game.Size = new System.Drawing.Size(193, 26); this.txt_alternative_game.TabIndex = 24; @@ -991,7 +1028,7 @@ namespace DisplayMagician.UIForms // this.lbl_game_priority.AutoSize = true; this.lbl_game_priority.ForeColor = System.Drawing.Color.White; - this.lbl_game_priority.Location = new System.Drawing.Point(36, 46); + this.lbl_game_priority.Location = new System.Drawing.Point(41, 81); this.lbl_game_priority.Name = "lbl_game_priority"; this.lbl_game_priority.Size = new System.Drawing.Size(108, 20); this.lbl_game_priority.TabIndex = 18; @@ -1036,7 +1073,7 @@ namespace DisplayMagician.UIForms // this.lbl_game_timeout.AutoSize = true; this.lbl_game_timeout.ForeColor = System.Drawing.Color.White; - this.lbl_game_timeout.Location = new System.Drawing.Point(349, 45); + this.lbl_game_timeout.Location = new System.Drawing.Point(353, 45); this.lbl_game_timeout.Name = "lbl_game_timeout"; this.lbl_game_timeout.Size = new System.Drawing.Size(125, 20); this.lbl_game_timeout.TabIndex = 4; @@ -1045,7 +1082,7 @@ namespace DisplayMagician.UIForms // // nud_timeout_game // - this.nud_timeout_game.Location = new System.Drawing.Point(480, 43); + this.nud_timeout_game.Location = new System.Drawing.Point(484, 44); this.nud_timeout_game.Maximum = new decimal(new int[] { 240, 0, @@ -1211,7 +1248,7 @@ namespace DisplayMagician.UIForms this.txt_shortcut_save_name.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txt_shortcut_save_name.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_shortcut_save_name.Location = new System.Drawing.Point(207, 731); + this.txt_shortcut_save_name.Location = new System.Drawing.Point(207, 759); this.txt_shortcut_save_name.MaxLength = 200; this.txt_shortcut_save_name.Name = "txt_shortcut_save_name"; this.txt_shortcut_save_name.Size = new System.Drawing.Size(744, 35); @@ -1237,7 +1274,7 @@ namespace DisplayMagician.UIForms this.lbl_shortcut_name.AutoSize = true; this.lbl_shortcut_name.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_shortcut_name.ForeColor = System.Drawing.Color.Transparent; - this.lbl_shortcut_name.Location = new System.Drawing.Point(23, 734); + this.lbl_shortcut_name.Location = new System.Drawing.Point(23, 762); this.lbl_shortcut_name.Name = "lbl_shortcut_name"; this.lbl_shortcut_name.Size = new System.Drawing.Size(178, 29); this.lbl_shortcut_name.TabIndex = 31; @@ -1251,7 +1288,7 @@ namespace DisplayMagician.UIForms this.cb_autosuggest.Checked = true; this.cb_autosuggest.CheckState = System.Windows.Forms.CheckState.Checked; this.cb_autosuggest.ForeColor = System.Drawing.Color.White; - this.cb_autosuggest.Location = new System.Drawing.Point(969, 740); + this.cb_autosuggest.Location = new System.Drawing.Point(969, 768); this.cb_autosuggest.Name = "cb_autosuggest"; this.cb_autosuggest.Size = new System.Drawing.Size(117, 17); this.cb_autosuggest.TabIndex = 32; @@ -1261,13 +1298,14 @@ namespace DisplayMagician.UIForms // // btn_hotkey // - this.btn_hotkey.Anchor = System.Windows.Forms.AnchorStyles.None; + this.btn_hotkey.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.btn_hotkey.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed; this.btn_hotkey.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown; this.btn_hotkey.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_hotkey.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_hotkey.ForeColor = System.Drawing.Color.White; - this.btn_hotkey.Location = new System.Drawing.Point(434, 778); + this.btn_hotkey.Location = new System.Drawing.Point(434, 806); this.btn_hotkey.Name = "btn_hotkey"; this.btn_hotkey.Size = new System.Drawing.Size(120, 40); this.btn_hotkey.TabIndex = 36; @@ -1289,38 +1327,15 @@ namespace DisplayMagician.UIForms this.lbl_hotkey_assigned.Visible = false; this.lbl_hotkey_assigned.Click += new System.EventHandler(this.lbl_hotkey_assigned_Click); // - // dv_profile + // lbl_game_library // - this.dv_profile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dv_profile.BackColor = System.Drawing.Color.DimGray; - this.dv_profile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.dv_profile.Font = new System.Drawing.Font("Consolas", 50F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dv_profile.ForeColor = System.Drawing.Color.MidnightBlue; - this.dv_profile.Location = new System.Drawing.Point(0, 0); - this.dv_profile.Margin = new System.Windows.Forms.Padding(18); - this.dv_profile.Name = "dv_profile"; - this.dv_profile.PaddingX = 100; - this.dv_profile.PaddingY = 100; - this.dv_profile.Profile = null; - this.dv_profile.Size = new System.Drawing.Size(1082, 467); - this.dv_profile.TabIndex = 23; - // - // btn_find_examples_game - // - this.btn_find_examples_game.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btn_find_examples_game.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed; - this.btn_find_examples_game.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown; - this.btn_find_examples_game.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_find_examples_game.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_find_examples_game.ForeColor = System.Drawing.Color.White; - this.btn_find_examples_game.Location = new System.Drawing.Point(953, 17); - this.btn_find_examples_game.Name = "btn_find_examples_game"; - this.btn_find_examples_game.Size = new System.Drawing.Size(117, 25); - this.btn_find_examples_game.TabIndex = 41; - this.btn_find_examples_game.Text = "Show me &Examples"; - this.btn_find_examples_game.UseVisualStyleBackColor = true; - this.btn_find_examples_game.Click += new System.EventHandler(this.btn_find_examples_game_Click); + this.lbl_game_library.AutoSize = true; + this.lbl_game_library.ForeColor = System.Drawing.Color.White; + this.lbl_game_library.Location = new System.Drawing.Point(41, 49); + this.lbl_game_library.Name = "lbl_game_library"; + this.lbl_game_library.Size = new System.Drawing.Size(108, 20); + this.lbl_game_library.TabIndex = 30; + this.lbl_game_library.Text = "Game Library:"; // // ShortcutForm // @@ -1329,7 +1344,7 @@ namespace DisplayMagician.UIForms this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Black; this.CancelButton = this.btn_cancel; - this.ClientSize = new System.Drawing.Size(1114, 830); + this.ClientSize = new System.Drawing.Size(1114, 858); this.Controls.Add(this.lbl_hotkey_assigned); this.Controls.Add(this.btn_hotkey); this.Controls.Add(this.cb_autosuggest); @@ -1474,5 +1489,6 @@ namespace DisplayMagician.UIForms private System.Windows.Forms.ComboBox cbx_exe_priority; private System.Windows.Forms.Label lbl_exe_priority; private System.Windows.Forms.Button btn_find_examples_game; + private System.Windows.Forms.Label lbl_game_library; } } \ No newline at end of file diff --git a/displaymagician/uiforms/displayprofileform.cs b/displaymagician/uiforms/displayprofileform.cs index 02bd94a..8cdbaed 100644 --- a/displaymagician/uiforms/displayprofileform.cs +++ b/displaymagician/uiforms/displayprofileform.cs @@ -570,5 +570,6 @@ namespace DisplayMagician.UIForms ProfileRepository.SaveProfiles(); } } + } } \ No newline at end of file