Phase 5-UI: JobsView extrahiert + Trading-Toggle in die Quickbar
- Neue JobsView (UserControl + Designer): DataGridView an JobManager.Jobs, Run-Now/Aktiv-Verhalten wie bisheriger Jobs-Tab. btn_jobs in toolstrip_windows, als View "core.jobs" registriert. - Trading-Toggle aus frm_main uebernommen: btn_liveTrading + btn_demoTrading in toolstrip_quickbar; Zyklus Inactive->SellOnly->Active mit Farb-/Textstatus, synchron zum TradingState (auch bei externen Aenderungen via 1s-Timer). - Build 0 Fehler. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
f112668147
commit
8e2a92ad2e
Generated
+46
-12
@@ -24,13 +24,17 @@ namespace PolyTraderSharp.Ui
|
||||
toolstrip_windows = new ToolStrip();
|
||||
btn_settings = new ToolStripButton();
|
||||
btn_terminal = new ToolStripButton();
|
||||
btn_jobs = new ToolStripButton();
|
||||
toolstrip_quickbar = new ToolStrip();
|
||||
btn_liveTrading = new ToolStripButton();
|
||||
btn_demoTrading = new ToolStripButton();
|
||||
statusStrip_info = new StatusStrip();
|
||||
lbl_trading = new ToolStripStatusLabel();
|
||||
lbl_modules = new ToolStripStatusLabel();
|
||||
lbl_ratelimit = new ToolStripStatusLabel();
|
||||
menuStrip.SuspendLayout();
|
||||
toolstrip_windows.SuspendLayout();
|
||||
toolstrip_quickbar.SuspendLayout();
|
||||
statusStrip_info.SuspendLayout();
|
||||
SuspendLayout();
|
||||
//
|
||||
@@ -67,7 +71,7 @@ namespace PolyTraderSharp.Ui
|
||||
//
|
||||
toolstrip_windows.AutoSize = false;
|
||||
toolstrip_windows.ImageScalingSize = new Size(64, 64);
|
||||
toolstrip_windows.Items.AddRange(new ToolStripItem[] { btn_settings, btn_terminal });
|
||||
toolstrip_windows.Items.AddRange(new ToolStripItem[] { btn_settings, btn_terminal, btn_jobs });
|
||||
toolstrip_windows.Location = new Point(0, 35);
|
||||
toolstrip_windows.Name = "toolstrip_windows";
|
||||
toolstrip_windows.Size = new Size(2599, 70);
|
||||
@@ -81,59 +85,84 @@ namespace PolyTraderSharp.Ui
|
||||
btn_settings.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_settings.ImageTransparentColor = Color.Magenta;
|
||||
btn_settings.Name = "btn_settings";
|
||||
btn_settings.Size = new Size(112, 65);
|
||||
btn_settings.Size = new Size(80, 65);
|
||||
btn_settings.Text = "Settings";
|
||||
btn_settings.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// btn_terminal
|
||||
//
|
||||
btn_terminal.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btn_terminal.Image = Properties.Resources.error_log;
|
||||
btn_terminal.ImageScaling = ToolStripItemImageScaling.None;
|
||||
btn_terminal.Name = "btn_terminal";
|
||||
btn_terminal.Size = new Size(112, 65);
|
||||
btn_terminal.Text = "Terminal";
|
||||
btn_terminal.Size = new Size(136, 65);
|
||||
btn_terminal.Text = "Terminal / Logs";
|
||||
btn_terminal.TextImageRelation = TextImageRelation.ImageAboveText;
|
||||
//
|
||||
// btn_jobs
|
||||
//
|
||||
btn_jobs.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btn_jobs.Name = "btn_jobs";
|
||||
btn_jobs.Size = new Size(100, 65);
|
||||
btn_jobs.Text = "Server Jobs";
|
||||
//
|
||||
// toolstrip_quickbar
|
||||
//
|
||||
toolstrip_quickbar.ImageScalingSize = new Size(24, 24);
|
||||
toolstrip_quickbar.Items.AddRange(new ToolStripItem[] { btn_liveTrading, btn_demoTrading });
|
||||
toolstrip_quickbar.Location = new Point(0, 105);
|
||||
toolstrip_quickbar.Name = "toolstrip_quickbar";
|
||||
toolstrip_quickbar.Size = new Size(2599, 25);
|
||||
toolstrip_quickbar.Size = new Size(2599, 28);
|
||||
toolstrip_quickbar.TabIndex = 4;
|
||||
toolstrip_quickbar.Text = "toolStrip2";
|
||||
//
|
||||
// btn_liveTrading
|
||||
//
|
||||
btn_liveTrading.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btn_liveTrading.Name = "btn_liveTrading";
|
||||
btn_liveTrading.Size = new Size(200, 25);
|
||||
btn_liveTrading.Text = "LiveTrading (—)";
|
||||
//
|
||||
// btn_demoTrading
|
||||
//
|
||||
btn_demoTrading.DisplayStyle = ToolStripItemDisplayStyle.Text;
|
||||
btn_demoTrading.Name = "btn_demoTrading";
|
||||
btn_demoTrading.Size = new Size(200, 25);
|
||||
btn_demoTrading.Text = "DemoTrading (—)";
|
||||
//
|
||||
// statusStrip_info
|
||||
//
|
||||
statusStrip_info.BackColor = Color.Gainsboro;
|
||||
statusStrip_info.ImageScalingSize = new Size(24, 24);
|
||||
statusStrip_info.Items.AddRange(new ToolStripItem[] { lbl_trading, lbl_modules, lbl_ratelimit });
|
||||
statusStrip_info.Location = new Point(0, 924);
|
||||
statusStrip_info.Location = new Point(0, 133);
|
||||
statusStrip_info.Name = "statusStrip_info";
|
||||
statusStrip_info.Size = new Size(2599, 22);
|
||||
statusStrip_info.Size = new Size(2599, 32);
|
||||
statusStrip_info.TabIndex = 5;
|
||||
statusStrip_info.Text = "statusStrip1";
|
||||
//
|
||||
// lbl_trading
|
||||
//
|
||||
lbl_trading.Name = "lbl_trading";
|
||||
lbl_trading.Size = new Size(100, 16);
|
||||
lbl_trading.Size = new Size(97, 25);
|
||||
lbl_trading.Text = "Trading: —";
|
||||
//
|
||||
// lbl_modules
|
||||
//
|
||||
lbl_modules.Name = "lbl_modules";
|
||||
lbl_modules.Size = new Size(90, 16);
|
||||
lbl_modules.Size = new Size(100, 25);
|
||||
lbl_modules.Text = "Module: —";
|
||||
//
|
||||
// lbl_ratelimit
|
||||
//
|
||||
lbl_ratelimit.Name = "lbl_ratelimit";
|
||||
lbl_ratelimit.Size = new Size(80, 16);
|
||||
lbl_ratelimit.Size = new Size(66, 25);
|
||||
lbl_ratelimit.Text = "API: —";
|
||||
//
|
||||
// LauncherForm
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(10F, 25F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(2599, 946);
|
||||
ClientSize = new Size(2599, 165);
|
||||
Controls.Add(statusStrip_info);
|
||||
Controls.Add(toolstrip_quickbar);
|
||||
Controls.Add(toolstrip_windows);
|
||||
@@ -147,6 +176,8 @@ namespace PolyTraderSharp.Ui
|
||||
menuStrip.PerformLayout();
|
||||
toolstrip_windows.ResumeLayout(false);
|
||||
toolstrip_windows.PerformLayout();
|
||||
toolstrip_quickbar.ResumeLayout(false);
|
||||
toolstrip_quickbar.PerformLayout();
|
||||
statusStrip_info.ResumeLayout(false);
|
||||
statusStrip_info.PerformLayout();
|
||||
ResumeLayout(false);
|
||||
@@ -162,7 +193,10 @@ namespace PolyTraderSharp.Ui
|
||||
private ToolStrip toolstrip_windows;
|
||||
private ToolStripButton btn_settings;
|
||||
private ToolStripButton btn_terminal;
|
||||
private ToolStripButton btn_jobs;
|
||||
private ToolStrip toolstrip_quickbar;
|
||||
private ToolStripButton btn_liveTrading;
|
||||
private ToolStripButton btn_demoTrading;
|
||||
private StatusStrip statusStrip_info;
|
||||
private ToolStripStatusLabel lbl_trading;
|
||||
private ToolStripStatusLabel lbl_modules;
|
||||
|
||||
@@ -31,12 +31,63 @@ namespace PolyTraderSharp.Ui
|
||||
|
||||
btn_settings.Click += (_, _) => OpenView("core.settings");
|
||||
btn_terminal.Click += (_, _) => OpenView("core.terminal");
|
||||
btn_jobs.Click += (_, _) => OpenView("core.jobs");
|
||||
btn_liveTrading.Click += (_, _) => CycleLiveTrading();
|
||||
btn_demoTrading.Click += (_, _) => CycleDemoTrading();
|
||||
miLegacy.Click += (_, _) => OpenLegacy();
|
||||
miBeenden.Click += (_, _) => Close();
|
||||
|
||||
_statusTimer.Tick += (_, _) => UpdateStatus();
|
||||
_statusTimer.Start();
|
||||
UpdateStatus();
|
||||
UpdateTradingToggles();
|
||||
}
|
||||
|
||||
private void CycleLiveTrading()
|
||||
{
|
||||
_state.LiveTradingMode = _state.LiveTradingMode switch
|
||||
{
|
||||
TradingMode.Inactive => TradingMode.SellOnly,
|
||||
TradingMode.SellOnly => TradingMode.Active,
|
||||
_ => TradingMode.Inactive
|
||||
};
|
||||
UpdateTradingToggles();
|
||||
}
|
||||
|
||||
private void CycleDemoTrading()
|
||||
{
|
||||
_state.DemoTradingMode = _state.DemoTradingMode switch
|
||||
{
|
||||
TradingMode.Inactive => TradingMode.SellOnly,
|
||||
TradingMode.SellOnly => TradingMode.Active,
|
||||
_ => TradingMode.Inactive
|
||||
};
|
||||
UpdateTradingToggles();
|
||||
}
|
||||
|
||||
private void UpdateTradingToggles()
|
||||
{
|
||||
ApplyToggle(btn_liveTrading, "LiveTrading", _state.LiveTradingMode);
|
||||
ApplyToggle(btn_demoTrading, "DemoTrading", _state.DemoTradingMode);
|
||||
|
||||
static void ApplyToggle(ToolStripButton btn, string label, TradingMode mode)
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
case TradingMode.Active:
|
||||
btn.Text = $"{label} (AKTIV)";
|
||||
btn.BackColor = System.Drawing.Color.LightGreen;
|
||||
break;
|
||||
case TradingMode.SellOnly:
|
||||
btn.Text = $"{label} (SELL-ONLY)";
|
||||
btn.BackColor = System.Drawing.Color.Orange;
|
||||
break;
|
||||
default:
|
||||
btn.Text = $"{label} (DEAKTIVIERT)";
|
||||
btn.BackColor = System.Drawing.Color.IndianRed;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Öffnet die Ansicht mit der angegebenen ID (bzw. fokussiert das offene Fenster).</summary>
|
||||
@@ -61,6 +112,9 @@ namespace PolyTraderSharp.Ui
|
||||
lbl_modules.Text = $"Module: {moduleCount}";
|
||||
|
||||
lbl_ratelimit.Text = $"API: {(_state.IsAlchemyHealthy ? "WSS aktiv" : "Polling")}";
|
||||
|
||||
// Toggle-Buttons mit externem State synchron halten (z.B. Änderungen aus der Legacy-UI).
|
||||
UpdateTradingToggles();
|
||||
}
|
||||
|
||||
private void OpenLegacy()
|
||||
|
||||
Generated
+129
@@ -0,0 +1,129 @@
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
partial class JobsView
|
||||
{
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Vom Komponenten-Designer generierter Code
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.dgvJobs = new System.Windows.Forms.DataGridView();
|
||||
this.colJobName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colLastRun = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.colNextRun = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
this.col_dgv_jobs_Enabled = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||
this.col_dgv_jobs_Run = new System.Windows.Forms.DataGridViewButtonColumn();
|
||||
this.colDescription = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvJobs)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// dgvJobs
|
||||
//
|
||||
this.dgvJobs.AllowUserToAddRows = false;
|
||||
this.dgvJobs.AllowUserToDeleteRows = false;
|
||||
this.dgvJobs.AutoGenerateColumns = false;
|
||||
this.dgvJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colJobName,
|
||||
this.colStatus,
|
||||
this.colLastRun,
|
||||
this.colNextRun,
|
||||
this.col_dgv_jobs_Enabled,
|
||||
this.col_dgv_jobs_Run,
|
||||
this.colDescription});
|
||||
this.dgvJobs.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.dgvJobs.Location = new System.Drawing.Point(0, 0);
|
||||
this.dgvJobs.Name = "dgvJobs";
|
||||
this.dgvJobs.RowHeadersVisible = false;
|
||||
this.dgvJobs.Size = new System.Drawing.Size(900, 500);
|
||||
this.dgvJobs.TabIndex = 0;
|
||||
//
|
||||
// colJobName
|
||||
//
|
||||
this.colJobName.DataPropertyName = "JobName";
|
||||
this.colJobName.HeaderText = "Job Name";
|
||||
this.colJobName.Name = "colJobName";
|
||||
this.colJobName.ReadOnly = true;
|
||||
this.colJobName.Width = 150;
|
||||
//
|
||||
// colStatus
|
||||
//
|
||||
this.colStatus.DataPropertyName = "StatusText";
|
||||
this.colStatus.HeaderText = "Status";
|
||||
this.colStatus.Name = "colStatus";
|
||||
this.colStatus.ReadOnly = true;
|
||||
this.colStatus.Width = 150;
|
||||
//
|
||||
// colLastRun
|
||||
//
|
||||
this.colLastRun.DataPropertyName = "LastRun";
|
||||
this.colLastRun.HeaderText = "Zuletzt ausgeführt";
|
||||
this.colLastRun.Name = "colLastRun";
|
||||
this.colLastRun.ReadOnly = true;
|
||||
this.colLastRun.Width = 130;
|
||||
//
|
||||
// colNextRun
|
||||
//
|
||||
this.colNextRun.DataPropertyName = "NextRun";
|
||||
this.colNextRun.HeaderText = "Nächster Lauf";
|
||||
this.colNextRun.Name = "colNextRun";
|
||||
this.colNextRun.ReadOnly = true;
|
||||
this.colNextRun.Width = 130;
|
||||
//
|
||||
// col_dgv_jobs_Enabled
|
||||
//
|
||||
this.col_dgv_jobs_Enabled.DataPropertyName = "IsEnabled";
|
||||
this.col_dgv_jobs_Enabled.HeaderText = "Aktiv";
|
||||
this.col_dgv_jobs_Enabled.Name = "col_dgv_jobs_Enabled";
|
||||
this.col_dgv_jobs_Enabled.Width = 60;
|
||||
//
|
||||
// col_dgv_jobs_Run
|
||||
//
|
||||
this.col_dgv_jobs_Run.HeaderText = "Aktion";
|
||||
this.col_dgv_jobs_Run.Name = "col_dgv_jobs_Run";
|
||||
this.col_dgv_jobs_Run.Text = "Run Now";
|
||||
this.col_dgv_jobs_Run.UseColumnTextForButtonValue = true;
|
||||
this.col_dgv_jobs_Run.Width = 90;
|
||||
//
|
||||
// colDescription
|
||||
//
|
||||
this.colDescription.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
|
||||
this.colDescription.DataPropertyName = "Description";
|
||||
this.colDescription.HeaderText = "Beschreibung";
|
||||
this.colDescription.Name = "colDescription";
|
||||
this.colDescription.ReadOnly = true;
|
||||
//
|
||||
// JobsView
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.dgvJobs);
|
||||
this.Name = "JobsView";
|
||||
this.Size = new System.Drawing.Size(900, 500);
|
||||
((System.ComponentModel.ISupportInitialize)(this.dgvJobs)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.DataGridView dgvJobs;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colJobName;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colStatus;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colLastRun;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colNextRun;
|
||||
private System.Windows.Forms.DataGridViewCheckBoxColumn col_dgv_jobs_Enabled;
|
||||
private System.Windows.Forms.DataGridViewButtonColumn col_dgv_jobs_Run;
|
||||
private System.Windows.Forms.DataGridViewTextBoxColumn colDescription;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using PolyTraderSharp.Models;
|
||||
using PolyTraderSharp.Services;
|
||||
|
||||
namespace PolyTraderSharp.Ui.Views
|
||||
{
|
||||
/// <summary>
|
||||
/// Ansicht der Hintergrund-Jobs (JobManager). Designbar (JobsView.Designer.cs).
|
||||
/// Verhalten wie der bisherige Jobs-Tab: „Run Now" löst den ManualTrigger aus,
|
||||
/// „Aktiv" schaltet den Job über die Bindung.
|
||||
/// </summary>
|
||||
public partial class JobsView : UserControl
|
||||
{
|
||||
public JobsView()
|
||||
{
|
||||
InitializeComponent();
|
||||
colLastRun.DefaultCellStyle.Format = "HH:mm:ss";
|
||||
colNextRun.DefaultCellStyle.Format = "HH:mm:ss";
|
||||
dgvJobs.CellContentClick += DgvJobs_CellContentClick;
|
||||
}
|
||||
|
||||
public void Initialize(JobManager jobManager)
|
||||
{
|
||||
dgvJobs.DataSource = jobManager.Jobs;
|
||||
}
|
||||
|
||||
private void DgvJobs_CellContentClick(object? sender, DataGridViewCellEventArgs e)
|
||||
{
|
||||
if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
|
||||
var dgv = (DataGridView)sender!;
|
||||
var colName = dgv.Columns[e.ColumnIndex].Name;
|
||||
|
||||
if (dgv.Rows[e.RowIndex].DataBoundItem is JobStatusRow job)
|
||||
{
|
||||
if (colName == "col_dgv_jobs_Run")
|
||||
{
|
||||
if (job.ManualTriggerAction != null)
|
||||
_ = Task.Run(() => job.ManualTriggerAction.Invoke());
|
||||
}
|
||||
else if (colName == "col_dgv_jobs_Enabled")
|
||||
{
|
||||
dgv.EndEdit();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user