diff --git a/ModpackUpdater.Apps.Manager/Api/Model/WorkspaceConfig.cs b/ModpackUpdater.Apps.Manager/Api/Model/WorkspaceConfig.cs index 5db78d9..fb82c9c 100644 --- a/ModpackUpdater.Apps.Manager/Api/Model/WorkspaceConfig.cs +++ b/ModpackUpdater.Apps.Manager/Api/Model/WorkspaceConfig.cs @@ -3,6 +3,4 @@ public class WorkspaceConfig { public string ProviderId { get; internal set; } = "origin.unknown"; - public string FileLocationInstallJson { get; set; } = "install.json"; - public string FileLocationUpdateJson { get; set; } = "update.json"; } diff --git a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfig.cs b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfig.cs index fe15f2f..c2d0e4d 100644 --- a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfig.cs +++ b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfig.cs @@ -9,4 +9,6 @@ internal class GitLabRepoWorkspaceConfig : WorkspaceConfig public string? ApiToken { get; set; } public long RepoId { get; set; } = -1L; public string RepoBranche { get; set; } = "master"; + public string FileLocationInstallJson { get; set; } = "install.json"; + public string FileLocationUpdateJson { get; set; } = "update.json"; } diff --git a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.Designer.cs b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.Designer.cs index 121ee61..1f14a20 100644 --- a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.Designer.cs +++ b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.Designer.cs @@ -28,9 +28,212 @@ partial class GitLabRepoWorkspaceConfigEditor /// private void InitializeComponent() { - components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + tableLayoutPanel1 = new TableLayoutPanel(); + radTextBox_FileLocUpdateJson = new Telerik.WinControls.UI.RadTextBox(); + radTextBox_FileLocInstallJson = new Telerik.WinControls.UI.RadTextBox(); + radTextBox_RepoBranche = new Telerik.WinControls.UI.RadTextBox(); + radSpinEditor_RepoId = new Telerik.WinControls.UI.RadSpinEditor(); + radTextBox_ApiToken = new Telerik.WinControls.UI.RadTextBox(); + radTextBox_InstanceUrl = new Telerik.WinControls.UI.RadTextBox(); + radLabel1 = new Telerik.WinControls.UI.RadLabel(); + radLabel2 = new Telerik.WinControls.UI.RadLabel(); + radLabel3 = new Telerik.WinControls.UI.RadLabel(); + radLabel4 = new Telerik.WinControls.UI.RadLabel(); + radLabel5 = new Telerik.WinControls.UI.RadLabel(); + radLabel6 = new Telerik.WinControls.UI.RadLabel(); + tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)radTextBox_FileLocUpdateJson).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_FileLocInstallJson).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_RepoBranche).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radSpinEditor_RepoId).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_ApiToken).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_InstanceUrl).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel2).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel3).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel4).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel5).BeginInit(); + ((System.ComponentModel.ISupportInitialize)radLabel6).BeginInit(); + SuspendLayout(); + // + // tableLayoutPanel1 + // + tableLayoutPanel1.AutoSize = true; + tableLayoutPanel1.AutoSizeMode = AutoSizeMode.GrowAndShrink; + tableLayoutPanel1.ColumnCount = 1; + tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F)); + tableLayoutPanel1.Controls.Add(radTextBox_FileLocUpdateJson, 0, 11); + tableLayoutPanel1.Controls.Add(radTextBox_FileLocInstallJson, 0, 9); + tableLayoutPanel1.Controls.Add(radTextBox_RepoBranche, 0, 7); + tableLayoutPanel1.Controls.Add(radSpinEditor_RepoId, 0, 5); + tableLayoutPanel1.Controls.Add(radTextBox_ApiToken, 0, 3); + tableLayoutPanel1.Controls.Add(radTextBox_InstanceUrl, 0, 1); + tableLayoutPanel1.Controls.Add(radLabel1, 0, 0); + tableLayoutPanel1.Controls.Add(radLabel2, 0, 2); + tableLayoutPanel1.Controls.Add(radLabel3, 0, 4); + tableLayoutPanel1.Controls.Add(radLabel4, 0, 6); + tableLayoutPanel1.Controls.Add(radLabel5, 0, 8); + tableLayoutPanel1.Controls.Add(radLabel6, 0, 10); + tableLayoutPanel1.Dock = DockStyle.Fill; + tableLayoutPanel1.Location = new Point(0, 30); + tableLayoutPanel1.Name = "tableLayoutPanel1"; + tableLayoutPanel1.RowCount = 12; + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle()); + tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 20F)); + tableLayoutPanel1.Size = new Size(300, 348); + tableLayoutPanel1.TabIndex = 4; + // + // radTextBox_FileLocUpdateJson + // + radTextBox_FileLocUpdateJson.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + radTextBox_FileLocUpdateJson.Location = new Point(3, 321); + radTextBox_FileLocUpdateJson.Name = "radTextBox_FileLocUpdateJson"; + radTextBox_FileLocUpdateJson.Size = new Size(294, 24); + radTextBox_FileLocUpdateJson.TabIndex = 4; + // + // radTextBox_FileLocInstallJson + // + radTextBox_FileLocInstallJson.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + radTextBox_FileLocInstallJson.Location = new Point(3, 263); + radTextBox_FileLocInstallJson.Name = "radTextBox_FileLocInstallJson"; + radTextBox_FileLocInstallJson.Size = new Size(294, 24); + radTextBox_FileLocInstallJson.TabIndex = 3; + // + // radTextBox_RepoBranche + // + radTextBox_RepoBranche.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + radTextBox_RepoBranche.Location = new Point(3, 205); + radTextBox_RepoBranche.Name = "radTextBox_RepoBranche"; + radTextBox_RepoBranche.Size = new Size(294, 24); + radTextBox_RepoBranche.TabIndex = 2; + // + // radSpinEditor_RepoId + // + radSpinEditor_RepoId.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + radSpinEditor_RepoId.Location = new Point(3, 147); + radSpinEditor_RepoId.Maximum = new decimal(new int[] { -1, int.MaxValue, 0, 0 }); + radSpinEditor_RepoId.Name = "radSpinEditor_RepoId"; + radSpinEditor_RepoId.Size = new Size(294, 24); + radSpinEditor_RepoId.TabIndex = 6; + // + // radTextBox_ApiToken + // + radTextBox_ApiToken.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + radTextBox_ApiToken.Location = new Point(3, 89); + radTextBox_ApiToken.Name = "radTextBox_ApiToken"; + radTextBox_ApiToken.Size = new Size(294, 24); + radTextBox_ApiToken.TabIndex = 1; + // + // radTextBox_InstanceUrl + // + radTextBox_InstanceUrl.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + radTextBox_InstanceUrl.Location = new Point(3, 31); + radTextBox_InstanceUrl.Name = "radTextBox_InstanceUrl"; + radTextBox_InstanceUrl.Size = new Size(294, 24); + radTextBox_InstanceUrl.TabIndex = 0; + // + // radLabel1 + // + radLabel1.Location = new Point(3, 3); + radLabel1.Name = "radLabel1"; + radLabel1.Size = new Size(80, 22); + radLabel1.TabIndex = 7; + radLabel1.Text = "Instance url"; + // + // radLabel2 + // + radLabel2.Location = new Point(3, 61); + radLabel2.Name = "radLabel2"; + radLabel2.Size = new Size(69, 22); + radLabel2.TabIndex = 8; + radLabel2.Text = "Api token"; + // + // radLabel3 + // + radLabel3.Location = new Point(3, 119); + radLabel3.Name = "radLabel3"; + radLabel3.Size = new Size(91, 22); + radLabel3.TabIndex = 9; + radLabel3.Text = "Repository id"; + // + // radLabel4 + // + radLabel4.Location = new Point(3, 177); + radLabel4.Name = "radLabel4"; + radLabel4.Size = new Size(130, 22); + radLabel4.TabIndex = 10; + radLabel4.Text = "Repository branche"; + // + // radLabel5 + // + radLabel5.Location = new Point(3, 235); + radLabel5.Name = "radLabel5"; + radLabel5.Size = new Size(181, 22); + radLabel5.TabIndex = 11; + radLabel5.Text = "File location for install infos"; + // + // radLabel6 + // + radLabel6.Location = new Point(3, 293); + radLabel6.Name = "radLabel6"; + radLabel6.Size = new Size(189, 22); + radLabel6.TabIndex = 12; + radLabel6.Text = "File location for updates info"; + // + // GitLabRepoWorkspaceConfigEditor + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + AutoSize = true; + AutoSizeMode = AutoSizeMode.GrowAndShrink; + BackColor = Color.Transparent; + Controls.Add(tableLayoutPanel1); + MinimumSize = new Size(300, 0); + Name = "GitLabRepoWorkspaceConfigEditor"; + Size = new Size(300, 408); + Controls.SetChildIndex(tableLayoutPanel1, 0); + tableLayoutPanel1.ResumeLayout(false); + tableLayoutPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)radTextBox_FileLocUpdateJson).EndInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_FileLocInstallJson).EndInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_RepoBranche).EndInit(); + ((System.ComponentModel.ISupportInitialize)radSpinEditor_RepoId).EndInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_ApiToken).EndInit(); + ((System.ComponentModel.ISupportInitialize)radTextBox_InstanceUrl).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel1).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel2).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel3).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel4).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel5).EndInit(); + ((System.ComponentModel.ISupportInitialize)radLabel6).EndInit(); + ResumeLayout(false); + PerformLayout(); } #endregion + + private TableLayoutPanel tableLayoutPanel1; + private Telerik.WinControls.UI.RadTextBox radTextBox_InstanceUrl; + private Telerik.WinControls.UI.RadTextBox radTextBox_ApiToken; + private Telerik.WinControls.UI.RadTextBox radTextBox_RepoBranche; + private Telerik.WinControls.UI.RadTextBox radTextBox_FileLocInstallJson; + private Telerik.WinControls.UI.RadTextBox radTextBox_FileLocUpdateJson; + private Telerik.WinControls.UI.RadSpinEditor radSpinEditor_RepoId; + private Telerik.WinControls.UI.RadLabel radLabel1; + private Telerik.WinControls.UI.RadLabel radLabel2; + private Telerik.WinControls.UI.RadLabel radLabel3; + private Telerik.WinControls.UI.RadLabel radLabel4; + private Telerik.WinControls.UI.RadLabel radLabel5; + private Telerik.WinControls.UI.RadLabel radLabel6; } diff --git a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.cs b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.cs index 268f6ec..005fde5 100644 --- a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.cs +++ b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.cs @@ -1,14 +1,43 @@ -using Pilz.UI.Telerik.Dialogs; +using Pilz.UI; +using Pilz.UI.Telerik.Dialogs; namespace ModpackUpdater.Apps.Manager.Features.Workspaces.GitLabRepo; -internal partial class GitLabRepoWorkspaceConfigEditor : RadFlyoutBase +internal partial class GitLabRepoWorkspaceConfigEditor : RadFlyoutBase, ILoadContent { private readonly GitLabRepoWorkspaceConfig settings; public GitLabRepoWorkspaceConfigEditor(GitLabRepoWorkspaceConfig settings) { this.settings = settings; + InitializeComponent(); + + var defaults = new GitLabRepoWorkspaceConfig(); + radTextBox_InstanceUrl.NullText = defaults.InstanceUrl; + radTextBox_RepoBranche.NullText = defaults.RepoBranche; + radTextBox_FileLocInstallJson.NullText = defaults.InstanceUrl; + radTextBox_FileLocUpdateJson.NullText = defaults.FileLocationUpdateJson; + } + + public void LoadContent() + { + radTextBox_InstanceUrl.Text = settings.InstanceUrl; + radTextBox_ApiToken.Text = settings.ApiToken; + radSpinEditor_RepoId.Value = settings.RepoId; + radTextBox_RepoBranche.Text = settings.RepoBranche; + radTextBox_FileLocInstallJson.Text = settings.InstanceUrl; + radTextBox_FileLocUpdateJson.Text = settings.FileLocationUpdateJson; + } + + protected override bool ValidateOK() + { + settings.InstanceUrl = radTextBox_InstanceUrl.Text.Trim(); + settings.ApiToken = radTextBox_ApiToken.Text.Trim(); + settings.RepoId = (long)radSpinEditor_RepoId.Value; + settings.RepoBranche = radTextBox_RepoBranche.Text.Trim(); + settings.InstanceUrl = radTextBox_FileLocInstallJson.Text.Trim(); + settings.FileLocationUpdateJson = radTextBox_FileLocUpdateJson.Text.Trim(); + return base.ValidateOK(); } } diff --git a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.resx b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.resx index 1af7de1..8b2ff64 100644 --- a/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.resx +++ b/ModpackUpdater.Apps.Manager/Features/Workspaces/GitLabRepo/GitLabRepoWorkspaceConfigEditor.resx @@ -1,17 +1,17 @@  - diff --git a/ModpackUpdater.Apps.Manager/Form1.cs b/ModpackUpdater.Apps.Manager/Form1.cs index 27231df..285ad5b 100644 --- a/ModpackUpdater.Apps.Manager/Form1.cs +++ b/ModpackUpdater.Apps.Manager/Form1.cs @@ -23,6 +23,16 @@ public partial class Form1 : RadForm, IMainApi // ... } + private void LoadWorkspace() + { + // ... + } + + private void LoadActionSet() + { + // ... + } + private void RadMenuItem_OpenNewWorkspace_Click(object? sender, EventArgs e) { // ...