Work on issue #248
git-svn-id: https://duplicati.googlecode.com/svn/trunk@473 59da171f-624f-0410-aa54-27559c288bec
This commit is contained in:
kenneth.skovhede@gmail.com
Generated
+28
-28
@@ -70,15 +70,15 @@ namespace Duplicati.GUI
|
||||
this.backupTasks = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.pauseBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.pausePeriodMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.PauseDuration05Menu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.PauseDuration15Menu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.PauseDuration30Menu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.PauseDuration60Menu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.stopBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.ShowAdvanced = new System.Windows.Forms.Button();
|
||||
this.CurrentStatus = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.PauseDuration05Menu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.PauseDuration15Menu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.PauseDuration30Menu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.PauseDuration60Menu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.advancedPanel.SuspendLayout();
|
||||
this.simplePanel.SuspendLayout();
|
||||
this.contextMenuStrip.SuspendLayout();
|
||||
@@ -241,30 +241,6 @@ namespace Duplicati.GUI
|
||||
this.pausePeriodMenuItem.Name = "pausePeriodMenuItem";
|
||||
resources.ApplyResources(this.pausePeriodMenuItem, "pausePeriodMenuItem");
|
||||
//
|
||||
// stopBackupToolStripMenuItem
|
||||
//
|
||||
this.stopBackupToolStripMenuItem.Image = global::Duplicati.GUI.Properties.Resources.Stop;
|
||||
this.stopBackupToolStripMenuItem.Name = "stopBackupToolStripMenuItem";
|
||||
resources.ApplyResources(this.stopBackupToolStripMenuItem, "stopBackupToolStripMenuItem");
|
||||
this.stopBackupToolStripMenuItem.Click += new System.EventHandler(this.stopBackupToolStripMenuItem_Click);
|
||||
//
|
||||
// ShowAdvanced
|
||||
//
|
||||
resources.ApplyResources(this.ShowAdvanced, "ShowAdvanced");
|
||||
this.ShowAdvanced.Name = "ShowAdvanced";
|
||||
this.ShowAdvanced.UseVisualStyleBackColor = true;
|
||||
this.ShowAdvanced.Click += new System.EventHandler(this.ShowAdvanced_Click);
|
||||
//
|
||||
// CurrentStatus
|
||||
//
|
||||
resources.ApplyResources(this.CurrentStatus, "CurrentStatus");
|
||||
this.CurrentStatus.Name = "CurrentStatus";
|
||||
//
|
||||
// label1
|
||||
//
|
||||
resources.ApplyResources(this.label1, "label1");
|
||||
this.label1.Name = "label1";
|
||||
//
|
||||
// PauseDuration05Menu
|
||||
//
|
||||
this.PauseDuration05Menu.Image = global::Duplicati.GUI.Properties.Resources.Clock05;
|
||||
@@ -297,6 +273,30 @@ namespace Duplicati.GUI
|
||||
this.PauseDuration60Menu.Tag = "1h";
|
||||
this.PauseDuration60Menu.Click += new System.EventHandler(this.PauseDurationMenu_Click);
|
||||
//
|
||||
// stopBackupToolStripMenuItem
|
||||
//
|
||||
this.stopBackupToolStripMenuItem.Image = global::Duplicati.GUI.Properties.Resources.Stop;
|
||||
this.stopBackupToolStripMenuItem.Name = "stopBackupToolStripMenuItem";
|
||||
resources.ApplyResources(this.stopBackupToolStripMenuItem, "stopBackupToolStripMenuItem");
|
||||
this.stopBackupToolStripMenuItem.Click += new System.EventHandler(this.stopBackupToolStripMenuItem_Click);
|
||||
//
|
||||
// ShowAdvanced
|
||||
//
|
||||
resources.ApplyResources(this.ShowAdvanced, "ShowAdvanced");
|
||||
this.ShowAdvanced.Name = "ShowAdvanced";
|
||||
this.ShowAdvanced.UseVisualStyleBackColor = true;
|
||||
this.ShowAdvanced.Click += new System.EventHandler(this.ShowAdvanced_Click);
|
||||
//
|
||||
// CurrentStatus
|
||||
//
|
||||
resources.ApplyResources(this.CurrentStatus, "CurrentStatus");
|
||||
this.CurrentStatus.Name = "CurrentStatus";
|
||||
//
|
||||
// label1
|
||||
//
|
||||
resources.ApplyResources(this.label1, "label1");
|
||||
this.label1.Name = "label1";
|
||||
//
|
||||
// ServiceStatus
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
|
||||
@@ -231,7 +231,7 @@ namespace Duplicati.GUI
|
||||
recentBackups.Items.Clear();
|
||||
foreach (Log l in logs)
|
||||
{
|
||||
ListViewItem lvi = new ListViewItem(new string[] { l.EndTime.ToString("g", System.Globalization.CultureInfo.CurrentUICulture), l.OwnerTask == null || l.OwnerTask.Schedule == null ? "" : l.OwnerTask.Schedule.Name, l.TransferSizeString });
|
||||
ListViewItem lvi = new ListViewItem(new string[] { l.EndTime.ToString("g", System.Globalization.CultureInfo.CurrentUICulture), l.OwnerTask == null || l.OwnerTask.Schedule == null ? "" : l.OwnerTask.Schedule.Name, l.Transfersize > 0 ? l.TransferSizeString : "" });
|
||||
|
||||
lvi.Tag = l;
|
||||
lvi.ImageIndex = imageList.Images.ContainsKey(l.ParsedStatus) ? imageList.Images.IndexOfKey(l.ParsedStatus) : imageList.Images.IndexOfKey("Warning");
|
||||
|
||||
@@ -324,10 +324,10 @@
|
||||
<value>116</value>
|
||||
</data>
|
||||
<data name="columnHeader2.Text" xml:space="preserve">
|
||||
<value>Action</value>
|
||||
<value>Backup set</value>
|
||||
</data>
|
||||
<data name="columnHeader2.Width" type="System.Int32, mscorlib">
|
||||
<value>96</value>
|
||||
<value>107</value>
|
||||
</data>
|
||||
<data name="columnHeader3.Text" xml:space="preserve">
|
||||
<value>Size</value>
|
||||
@@ -338,6 +338,21 @@
|
||||
<metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>208, 17</value>
|
||||
</metadata>
|
||||
<data name="viewLogToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Tahoma, 8.25pt, style=Bold</value>
|
||||
</data>
|
||||
<data name="viewLogToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>160, 22</value>
|
||||
</data>
|
||||
<data name="viewLogToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>View log ...</value>
|
||||
</data>
|
||||
<data name="viewFilesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>160, 22</value>
|
||||
</data>
|
||||
<data name="viewFilesToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>View contents ...</value>
|
||||
</data>
|
||||
<data name="contextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>161, 48</value>
|
||||
</data>
|
||||
@@ -378,49 +393,49 @@
|
||||
<value>346, 17</value>
|
||||
</metadata>
|
||||
<data name="pauseBackupToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>152, 22</value>
|
||||
<value>147, 22</value>
|
||||
</data>
|
||||
<data name="pauseBackupToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Pause backup</value>
|
||||
</data>
|
||||
<data name="PauseDuration05Menu.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>152, 22</value>
|
||||
<value>132, 22</value>
|
||||
</data>
|
||||
<data name="PauseDuration05Menu.Text" xml:space="preserve">
|
||||
<value>5 minutes</value>
|
||||
</data>
|
||||
<data name="PauseDuration15Menu.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>152, 22</value>
|
||||
<value>132, 22</value>
|
||||
</data>
|
||||
<data name="PauseDuration15Menu.Text" xml:space="preserve">
|
||||
<value>15 minutes</value>
|
||||
</data>
|
||||
<data name="PauseDuration30Menu.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>152, 22</value>
|
||||
<value>132, 22</value>
|
||||
</data>
|
||||
<data name="PauseDuration30Menu.Text" xml:space="preserve">
|
||||
<value>30 minutes</value>
|
||||
</data>
|
||||
<data name="PauseDuration60Menu.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>152, 22</value>
|
||||
<value>132, 22</value>
|
||||
</data>
|
||||
<data name="PauseDuration60Menu.Text" xml:space="preserve">
|
||||
<value>1 hour</value>
|
||||
</data>
|
||||
<data name="pausePeriodMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>152, 22</value>
|
||||
<value>147, 22</value>
|
||||
</data>
|
||||
<data name="pausePeriodMenuItem.Text" xml:space="preserve">
|
||||
<value>Pause period</value>
|
||||
</data>
|
||||
<data name="stopBackupToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>152, 22</value>
|
||||
<value>147, 22</value>
|
||||
</data>
|
||||
<data name="stopBackupToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Stop backup</value>
|
||||
</data>
|
||||
<data name="backupTasks.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>153, 92</value>
|
||||
<value>148, 70</value>
|
||||
</data>
|
||||
<data name=">>backupTasks.Name" xml:space="preserve">
|
||||
<value>backupTasks</value>
|
||||
@@ -551,21 +566,6 @@
|
||||
<data name=">>simplePanel.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="viewLogToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Tahoma, 8.25pt, style=Bold</value>
|
||||
</data>
|
||||
<data name="viewLogToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>160, 22</value>
|
||||
</data>
|
||||
<data name="viewLogToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>View log ...</value>
|
||||
</data>
|
||||
<data name="viewFilesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>160, 22</value>
|
||||
</data>
|
||||
<data name="viewFilesToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>View contents ...</value>
|
||||
</data>
|
||||
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>116, 17</value>
|
||||
</metadata>
|
||||
@@ -1132,18 +1132,6 @@
|
||||
<data name=">>pausePeriodMenuItem.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>stopBackupToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>stopBackupToolStripMenuItem</value>
|
||||
</data>
|
||||
<data name=">>stopBackupToolStripMenuItem.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>toolTip1.Name" xml:space="preserve">
|
||||
<value>toolTip1</value>
|
||||
</data>
|
||||
<data name=">>toolTip1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>PauseDuration05Menu.Name" xml:space="preserve">
|
||||
<value>PauseDuration05Menu</value>
|
||||
</data>
|
||||
@@ -1168,6 +1156,18 @@
|
||||
<data name=">>PauseDuration60Menu.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>stopBackupToolStripMenuItem.Name" xml:space="preserve">
|
||||
<value>stopBackupToolStripMenuItem</value>
|
||||
</data>
|
||||
<data name=">>stopBackupToolStripMenuItem.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>toolTip1.Name" xml:space="preserve">
|
||||
<value>toolTip1</value>
|
||||
</data>
|
||||
<data name=">>toolTip1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>ServiceStatus</value>
|
||||
</data>
|
||||
|
||||
Reference in New Issue
Block a user