diff --git a/Duplicati/GUI/ApplicationSetup.Designer.cs b/Duplicati/GUI/ApplicationSetup.Designer.cs
index 934b6c042..5d1604f1b 100644
--- a/Duplicati/GUI/ApplicationSetup.Designer.cs
+++ b/Duplicati/GUI/ApplicationSetup.Designer.cs
@@ -31,9 +31,12 @@ namespace Duplicati.GUI
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ApplicationSetup));
this.label1 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.HideDonateButton = new System.Windows.Forms.CheckBox();
+ this.StartupDelayDuration = new Duplicati.GUI.HelperControls.DurationEditor();
this.label7 = new System.Windows.Forms.Label();
this.LanguageSelection = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
+ this.RecentDuration = new Duplicati.GUI.HelperControls.DurationEditor();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.CacheSizeLabel = new System.Windows.Forms.Label();
this.ClearCacheButton = new System.Windows.Forms.Button();
@@ -59,11 +62,9 @@ namespace Duplicati.GUI
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.panel1 = new System.Windows.Forms.Panel();
- this.StartupDelayDuration = new Duplicati.GUI.HelperControls.DurationEditor();
- this.RecentDuration = new Duplicati.GUI.HelperControls.DurationEditor();
this.Bandwidth = new Duplicati.GUI.HelperControls.BandwidthLimit();
this.ThreadPriorityPicker = new Duplicati.GUI.HelperControls.ThreadPriorityPicker();
+ this.panel1 = new System.Windows.Forms.Panel();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.PasswordDefaultsGroup.SuspendLayout();
@@ -82,6 +83,7 @@ namespace Duplicati.GUI
//
// groupBox1
//
+ this.groupBox1.Controls.Add(this.HideDonateButton);
this.groupBox1.Controls.Add(this.StartupDelayDuration);
this.groupBox1.Controls.Add(this.label7);
this.groupBox1.Controls.Add(this.LanguageSelection);
@@ -92,6 +94,20 @@ namespace Duplicati.GUI
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
+ // HideDonateButton
+ //
+ resources.ApplyResources(this.HideDonateButton, "HideDonateButton");
+ this.HideDonateButton.Name = "HideDonateButton";
+ this.HideDonateButton.UseVisualStyleBackColor = true;
+ this.HideDonateButton.CheckedChanged += new System.EventHandler(this.HideDonateButton_CheckedChanged);
+ //
+ // StartupDelayDuration
+ //
+ resources.ApplyResources(this.StartupDelayDuration, "StartupDelayDuration");
+ this.StartupDelayDuration.Name = "StartupDelayDuration";
+ this.StartupDelayDuration.Value = "";
+ this.StartupDelayDuration.ValueChanged += new System.EventHandler(this.StartupDelayDuration_ValueChanged);
+ //
// label7
//
resources.ApplyResources(this.label7, "label7");
@@ -110,6 +126,13 @@ namespace Duplicati.GUI
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
//
+ // RecentDuration
+ //
+ resources.ApplyResources(this.RecentDuration, "RecentDuration");
+ this.RecentDuration.Name = "RecentDuration";
+ this.RecentDuration.Value = "";
+ this.RecentDuration.ValueChanged += new System.EventHandler(this.RecentDuration_ValueChanged);
+ //
// groupBox2
//
this.groupBox2.Controls.Add(this.CacheSizeLabel);
@@ -276,27 +299,6 @@ namespace Duplicati.GUI
this.groupBox4.Name = "groupBox4";
this.groupBox4.TabStop = false;
//
- // panel1
- //
- this.panel1.Controls.Add(this.OKBtn);
- this.panel1.Controls.Add(this.CancelBtn);
- resources.ApplyResources(this.panel1, "panel1");
- this.panel1.Name = "panel1";
- //
- // StartupDelayDuration
- //
- resources.ApplyResources(this.StartupDelayDuration, "StartupDelayDuration");
- this.StartupDelayDuration.Name = "StartupDelayDuration";
- this.StartupDelayDuration.Value = "";
- this.StartupDelayDuration.ValueChanged += new System.EventHandler(this.StartupDelayDuration_ValueChanged);
- //
- // RecentDuration
- //
- resources.ApplyResources(this.RecentDuration, "RecentDuration");
- this.RecentDuration.Name = "RecentDuration";
- this.RecentDuration.Value = "";
- this.RecentDuration.ValueChanged += new System.EventHandler(this.RecentDuration_ValueChanged);
- //
// Bandwidth
//
this.Bandwidth.DownloadLimit = null;
@@ -314,6 +316,13 @@ namespace Duplicati.GUI
this.ThreadPriorityPicker.Name = "ThreadPriorityPicker";
this.ThreadPriorityPicker.SelectedPriorityChanged += new System.EventHandler(this.ThreadPriorityPicker_SelectedPriorityChanged);
//
+ // panel1
+ //
+ this.panel1.Controls.Add(this.OKBtn);
+ this.panel1.Controls.Add(this.CancelBtn);
+ resources.ApplyResources(this.panel1, "panel1");
+ this.panel1.Name = "panel1";
+ //
// ApplicationSetup
//
resources.ApplyResources(this, "$this");
@@ -381,5 +390,6 @@ namespace Duplicati.GUI
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label EncryptionMethod;
private System.Windows.Forms.ComboBox EncryptionModule;
+ private System.Windows.Forms.CheckBox HideDonateButton;
}
}
\ No newline at end of file
diff --git a/Duplicati/GUI/ApplicationSetup.cs b/Duplicati/GUI/ApplicationSetup.cs
index d54ba4574..99aa59369 100644
--- a/Duplicati/GUI/ApplicationSetup.cs
+++ b/Duplicati/GUI/ApplicationSetup.cs
@@ -228,6 +228,8 @@ namespace Duplicati.GUI
Bandwidth.UploadLimit = m_settings.UploadSpeedLimit;
Bandwidth.DownloadLimit = m_settings.DownloadSpeedLimit;
+ HideDonateButton.Checked = m_settings.HideDonateButton;
+
if (string.IsNullOrEmpty(m_settings.DisplayLanguage))
LanguageSelection.SelectedIndex = 0;
else
@@ -477,5 +479,13 @@ namespace Duplicati.GUI
foreach (Library.Interface.ISettingsControl ic in Library.DynamicLoader.SettingsControlLoader.Modules)
ic.EndEdit(env, SettingExtension.GetExtensions(connection, ic.Key));
}
+
+ private void HideDonateButton_CheckedChanged(object sender, EventArgs e)
+ {
+ if (m_isUpdating)
+ return;
+
+ m_settings.HideDonateButton = HideDonateButton.Checked;
+ }
}
}
\ No newline at end of file
diff --git a/Duplicati/GUI/ApplicationSetup.resx b/Duplicati/GUI/ApplicationSetup.resx
index d24cbb28d..0b188b53b 100644
--- a/Duplicati/GUI/ApplicationSetup.resx
+++ b/Duplicati/GUI/ApplicationSetup.resx
@@ -148,13 +148,40 @@
groupBox1
- 5
+ 6
+
+
+ True
+
+
+ 8, 96
+
+
+ 253, 17
+
+
+ 6
+
+
+ Hide the donate button on the main wizard page
+
+
+ HideDonateButton
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 0
- Right
+ Top, Right
- 208, 72
+ 208, 71
221, 21
@@ -172,7 +199,7 @@
groupBox1
- 0
+ 1
True
@@ -202,13 +229,13 @@
groupBox1
- 1
+ 2
- Right
+ Top, Right
- 208, 24
+ 208, 23
223, 21
@@ -226,7 +253,7 @@
groupBox1
- 2
+ 3
True
@@ -256,13 +283,13 @@
groupBox1
- 3
+ 4
- Right
+ Top, Right
- 208, 48
+ 208, 47
221, 21
@@ -280,7 +307,7 @@
groupBox1
- 4
+ 5
Top
@@ -289,7 +316,7 @@
3, 3
- 439, 104
+ 439, 125
4
@@ -730,7 +757,7 @@
8, 40
- 424, 96
+ 424, 64
3
@@ -781,10 +808,10 @@
Top
- 3, 107
+ 3, 128
- 439, 144
+ 439, 117
8
@@ -817,7 +844,7 @@
3, 3, 3, 3
- 445, 317
+ 445, 277
0
@@ -1493,9 +1520,6 @@
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAA==
-
- NoControl
-
CenterScreen
diff --git a/Duplicati/GUI/Datamodel/ApplicationSettings.cs b/Duplicati/GUI/Datamodel/ApplicationSettings.cs
index 643c3ec45..10c9480fe 100644
--- a/Duplicati/GUI/Datamodel/ApplicationSettings.cs
+++ b/Duplicati/GUI/Datamodel/ApplicationSettings.cs
@@ -40,13 +40,12 @@ namespace Duplicati.Datamodel
private const string DISPLAY_LANGUAGE = "Display Language";
- //This is only used on windows, on linux, it is assumed that the programs are in the path env.
- public const string PROGRAM_FILES = "%PROGRAMFILES%";
+ private const string STARTUP_DELAY_DURATION = "Startup delay duration";
+ private const string THREAD_PRIORITY_OVERRIDE = "Thread priority override";
+ private const string UPLOAD_SPEED_LIMIT = "Upload speed limit";
+ private const string DOWNLOAD_SPEED_LIMIT = "Download speed limit";
- public const string STARTUP_DELAY_DURATION = "Startup delay duration";
- public const string THREAD_PRIORITY_OVERRIDE = "Thread priority override";
- public const string UPLOAD_SPEED_LIMIT = "Upload speed limit";
- public const string DOWNLOAD_SPEED_LIMIT = "Download speed limit";
+ private const string HIDE_DONATE_BUTTON = "Hide donate button";
public ApplicationSettings(IDataFetcher dataparent)
{
@@ -253,5 +252,19 @@ namespace Duplicati.Datamodel
set { m_appset[UPLOAD_SPEED_LIMIT] = value == null ? "" : value; }
}
+ ///
+ /// Gets or sets a value indicating if the donate button in Duplicati should be hidden
+ ///
+ public bool HideDonateButton
+ {
+ get
+ {
+ string tmp;
+ m_appset.TryGetValue(HIDE_DONATE_BUTTON, out tmp);
+
+ return Duplicati.Library.Core.Utility.ParseBool(tmp, false);
+ }
+ set { m_appset[HIDE_DONATE_BUTTON] = value.ToString(); }
+ }
}
}
diff --git a/Duplicati/GUI/Wizard pages/MainPage.cs b/Duplicati/GUI/Wizard pages/MainPage.cs
index 2e8cce347..430b43d9e 100644
--- a/Duplicati/GUI/Wizard pages/MainPage.cs
+++ b/Duplicati/GUI/Wizard pages/MainPage.cs
@@ -39,6 +39,8 @@ namespace Duplicati.GUI.Wizard_pages
{
InitializeComponent();
+ donate_panel.Visible = !new ApplicationSettings(Program.DataConnection).HideDonateButton;
+
base.PageEnter += new PageChangeHandler(MainPage_PageEnter);
base.PageLeave += new PageChangeHandler(MainPage_PageLeave);
base.PageDisplay += new PageChangeHandler(MainPage_PageDisplay);