diff --git a/Configuration/Arguments.cs b/Configuration/Arguments.cs
index a18c5fd2..d6619429 100644
--- a/Configuration/Arguments.cs
+++ b/Configuration/Arguments.cs
@@ -6,7 +6,6 @@ static class Arguments{
// public args
public const string ArgDataFolder = "-datafolder";
public const string ArgLogging = "-log";
- public const string ArgDebugUpdates = "-debugupdates";
// internal args
public const string ArgRestart = "-restart";
diff --git a/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs b/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs
index 7f73f034..47fb524d 100644
--- a/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs
+++ b/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs
@@ -28,21 +28,22 @@ private void InitializeComponent() {
this.btnRestart = new System.Windows.Forms.Button();
this.cbLogging = new System.Windows.Forms.CheckBox();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
- this.cbDebugUpdates = new System.Windows.Forms.CheckBox();
this.tbDataFolder = new System.Windows.Forms.TextBox();
this.tbShortcutTarget = new System.Windows.Forms.TextBox();
this.labelDataFolder = new System.Windows.Forms.Label();
this.labelShortcutTarget = new System.Windows.Forms.Label();
+ this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
+ this.flowPanel.SuspendLayout();
this.SuspendLayout();
//
// btnCancel
//
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.btnCancel.Location = new System.Drawing.Point(215, 163);
+ this.btnCancel.Location = new System.Drawing.Point(215, 139);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
this.btnCancel.Size = new System.Drawing.Size(56, 23);
- this.btnCancel.TabIndex = 9;
+ this.btnCancel.TabIndex = 2;
this.btnCancel.Text = "Cancel";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -50,11 +51,11 @@ private void InitializeComponent() {
// btnRestart
//
this.btnRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.btnRestart.Location = new System.Drawing.Point(152, 163);
+ this.btnRestart.Location = new System.Drawing.Point(152, 139);
this.btnRestart.Name = "btnRestart";
this.btnRestart.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
this.btnRestart.Size = new System.Drawing.Size(57, 23);
- this.btnRestart.TabIndex = 8;
+ this.btnRestart.TabIndex = 1;
this.btnRestart.Text = "Restart";
this.btnRestart.UseVisualStyleBackColor = true;
this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
@@ -62,7 +63,7 @@ private void InitializeComponent() {
// cbLogging
//
this.cbLogging.AutoSize = true;
- this.cbLogging.Location = new System.Drawing.Point(12, 12);
+ this.cbLogging.Location = new System.Drawing.Point(3, 3);
this.cbLogging.Name = "cbLogging";
this.cbLogging.Size = new System.Drawing.Size(64, 17);
this.cbLogging.TabIndex = 0;
@@ -70,25 +71,12 @@ private void InitializeComponent() {
this.toolTip.SetToolTip(this.cbLogging, "Logging JavaScript output into TD_Console.txt file in the data folder.");
this.cbLogging.UseVisualStyleBackColor = true;
//
- // cbDebugUpdates
- //
- this.cbDebugUpdates.AutoSize = true;
- this.cbDebugUpdates.Location = new System.Drawing.Point(12, 35);
- this.cbDebugUpdates.Name = "cbDebugUpdates";
- this.cbDebugUpdates.Size = new System.Drawing.Size(127, 17);
- this.cbDebugUpdates.TabIndex = 1;
- this.cbDebugUpdates.Text = "Pre-Release Updates";
- this.toolTip.SetToolTip(this.cbDebugUpdates, "Allows updating to pre-releases.");
- this.cbDebugUpdates.UseVisualStyleBackColor = true;
- //
// tbDataFolder
//
- this.tbDataFolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.tbDataFolder.Location = new System.Drawing.Point(15, 83);
+ this.tbDataFolder.Location = new System.Drawing.Point(3, 51);
this.tbDataFolder.Name = "tbDataFolder";
- this.tbDataFolder.Size = new System.Drawing.Size(257, 20);
- this.tbDataFolder.TabIndex = 5;
+ this.tbDataFolder.Size = new System.Drawing.Size(260, 20);
+ this.tbDataFolder.TabIndex = 2;
this.toolTip.SetToolTip(this.tbDataFolder, "Path to the data folder. Must be either an absolute path,\r\nor a simple folder nam" +
"e that will be created in LocalAppData.");
//
@@ -97,44 +85,57 @@ private void InitializeComponent() {
this.tbShortcutTarget.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tbShortcutTarget.Cursor = System.Windows.Forms.Cursors.Hand;
- this.tbShortcutTarget.Location = new System.Drawing.Point(15, 134);
+ this.tbShortcutTarget.Location = new System.Drawing.Point(3, 102);
this.tbShortcutTarget.Name = "tbShortcutTarget";
this.tbShortcutTarget.ReadOnly = true;
- this.tbShortcutTarget.Size = new System.Drawing.Size(257, 20);
- this.tbShortcutTarget.TabIndex = 7;
+ this.tbShortcutTarget.Size = new System.Drawing.Size(260, 20);
+ this.tbShortcutTarget.TabIndex = 4;
this.tbShortcutTarget.Click += new System.EventHandler(this.tbShortcutTarget_Click);
//
// labelDataFolder
//
this.labelDataFolder.AutoSize = true;
- this.labelDataFolder.Location = new System.Drawing.Point(12, 67);
+ this.labelDataFolder.Location = new System.Drawing.Point(3, 35);
this.labelDataFolder.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
this.labelDataFolder.Name = "labelDataFolder";
this.labelDataFolder.Size = new System.Drawing.Size(62, 13);
- this.labelDataFolder.TabIndex = 4;
+ this.labelDataFolder.TabIndex = 1;
this.labelDataFolder.Text = "Data Folder";
//
// labelShortcutTarget
//
this.labelShortcutTarget.AutoSize = true;
- this.labelShortcutTarget.Location = new System.Drawing.Point(12, 118);
+ this.labelShortcutTarget.Location = new System.Drawing.Point(3, 86);
this.labelShortcutTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
this.labelShortcutTarget.Name = "labelShortcutTarget";
this.labelShortcutTarget.Size = new System.Drawing.Size(155, 13);
- this.labelShortcutTarget.TabIndex = 6;
+ this.labelShortcutTarget.TabIndex = 3;
this.labelShortcutTarget.Text = "Shortcut Target (click to select)";
//
+ // flowPanel
+ //
+ this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.flowPanel.Controls.Add(this.cbLogging);
+ this.flowPanel.Controls.Add(this.labelDataFolder);
+ this.flowPanel.Controls.Add(this.tbDataFolder);
+ this.flowPanel.Controls.Add(this.labelShortcutTarget);
+ this.flowPanel.Controls.Add(this.tbShortcutTarget);
+ this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+ this.flowPanel.Location = new System.Drawing.Point(9, 9);
+ this.flowPanel.Margin = new System.Windows.Forms.Padding(0);
+ this.flowPanel.Name = "flowPanel";
+ this.flowPanel.Size = new System.Drawing.Size(266, 127);
+ this.flowPanel.TabIndex = 0;
+ this.flowPanel.WrapContents = false;
+ //
// DialogSettingsRestart
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(284, 198);
- this.Controls.Add(this.tbShortcutTarget);
- this.Controls.Add(this.labelShortcutTarget);
- this.Controls.Add(this.tbDataFolder);
- this.Controls.Add(this.labelDataFolder);
- this.Controls.Add(this.cbDebugUpdates);
- this.Controls.Add(this.cbLogging);
+ this.ClientSize = new System.Drawing.Size(284, 174);
+ this.Controls.Add(this.flowPanel);
this.Controls.Add(this.btnRestart);
this.Controls.Add(this.btnCancel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -143,8 +144,9 @@ private void InitializeComponent() {
this.Name = "DialogSettingsRestart";
this.ShowIcon = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.flowPanel.ResumeLayout(false);
+ this.flowPanel.PerformLayout();
this.ResumeLayout(false);
- this.PerformLayout();
}
@@ -154,10 +156,10 @@ private void InitializeComponent() {
private System.Windows.Forms.Button btnRestart;
private System.Windows.Forms.CheckBox cbLogging;
private System.Windows.Forms.ToolTip toolTip;
- private System.Windows.Forms.CheckBox cbDebugUpdates;
private System.Windows.Forms.Label labelDataFolder;
private System.Windows.Forms.TextBox tbDataFolder;
private System.Windows.Forms.TextBox tbShortcutTarget;
private System.Windows.Forms.Label labelShortcutTarget;
+ private System.Windows.Forms.FlowLayoutPanel flowPanel;
}
}
\ No newline at end of file
diff --git a/Core/Other/Settings/Dialogs/DialogSettingsRestart.cs b/Core/Other/Settings/Dialogs/DialogSettingsRestart.cs
index b4f9bb7e..22ade2d1 100644
--- a/Core/Other/Settings/Dialogs/DialogSettingsRestart.cs
+++ b/Core/Other/Settings/Dialogs/DialogSettingsRestart.cs
@@ -11,10 +11,7 @@ public DialogSettingsRestart(CommandLineArgs currentArgs){
InitializeComponent();
cbLogging.Checked = currentArgs.HasFlag(Arguments.ArgLogging);
- cbDebugUpdates.Checked = currentArgs.HasFlag(Arguments.ArgDebugUpdates);
-
cbLogging.CheckedChanged += control_Change;
- cbDebugUpdates.CheckedChanged += control_Change;
if (Program.IsPortable){
tbDataFolder.Text = "Not available in portable version";
@@ -36,10 +33,6 @@ private void control_Change(object sender, EventArgs e){
if (cbLogging.Checked){
Args.AddFlag(Arguments.ArgLogging);
}
-
- if (cbDebugUpdates.Checked){
- Args.AddFlag(Arguments.ArgDebugUpdates);
- }
if (!string.IsNullOrWhiteSpace(tbDataFolder.Text) && tbDataFolder.Enabled){
Args.SetValue(Arguments.ArgDataFolder, tbDataFolder.Text);
diff --git a/Updates/UpdaterSettings.cs b/Updates/UpdaterSettings.cs
index e845f70b..a7c48609 100644
--- a/Updates/UpdaterSettings.cs
+++ b/Updates/UpdaterSettings.cs
@@ -1,8 +1,7 @@
namespace TweetDuck.Updates{
sealed class UpdaterSettings{
public string InstallerDownloadFolder { get; }
-
- public bool AllowPreReleases { get; set; }
+
public string DismissedUpdate { get; set; }
public UpdaterSettings(string installerDownloadFolder){