From 6d7156469b2a1cd55573a1024daa25e19eb2e9ea Mon Sep 17 00:00:00 2001 From: "kenneth.skovhede@gmail.com" Date: Sun, 15 Aug 2010 16:06:06 +0000 Subject: [PATCH] Work on issue #248 git-svn-id: https://duplicati.googlecode.com/svn/trunk@473 59da171f-624f-0410-aa54-27559c288bec --- Duplicati/GUI/ServiceStatus.Designer.cs | 56 +++++++++---------- Duplicati/GUI/ServiceStatus.cs | 2 +- Duplicati/GUI/ServiceStatus.resx | 74 ++++++++++++------------- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Duplicati/GUI/ServiceStatus.Designer.cs b/Duplicati/GUI/ServiceStatus.Designer.cs index e7cd829b9..0bd7258bc 100644 --- a/Duplicati/GUI/ServiceStatus.Designer.cs +++ b/Duplicati/GUI/ServiceStatus.Designer.cs @@ -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"); diff --git a/Duplicati/GUI/ServiceStatus.cs b/Duplicati/GUI/ServiceStatus.cs index 44aa484f3..3534c7719 100644 --- a/Duplicati/GUI/ServiceStatus.cs +++ b/Duplicati/GUI/ServiceStatus.cs @@ -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"); diff --git a/Duplicati/GUI/ServiceStatus.resx b/Duplicati/GUI/ServiceStatus.resx index dc8735f91..4053bd3db 100644 --- a/Duplicati/GUI/ServiceStatus.resx +++ b/Duplicati/GUI/ServiceStatus.resx @@ -324,10 +324,10 @@ 116 - Action + Backup set - 96 + 107 Size @@ -338,6 +338,21 @@ 208, 17 + + Tahoma, 8.25pt, style=Bold + + + 160, 22 + + + View log ... + + + 160, 22 + + + View contents ... + 161, 48 @@ -378,49 +393,49 @@ 346, 17 - 152, 22 + 147, 22 Pause backup - 152, 22 + 132, 22 5 minutes - 152, 22 + 132, 22 15 minutes - 152, 22 + 132, 22 30 minutes - 152, 22 + 132, 22 1 hour - 152, 22 + 147, 22 Pause period - 152, 22 + 147, 22 Stop backup - 153, 92 + 148, 70 backupTasks @@ -551,21 +566,6 @@ 2 - - Tahoma, 8.25pt, style=Bold - - - 160, 22 - - - View log ... - - - 160, 22 - - - View contents ... - 116, 17 @@ -1132,18 +1132,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - stopBackupToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolTip1 - - - System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - PauseDuration05Menu @@ -1168,6 +1156,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + stopBackupToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ServiceStatus