diff --git a/src/ui/Forms/Main.Designer.cs b/src/ui/Forms/Main.Designer.cs index a1f786e6d..569b2a500 100644 --- a/src/ui/Forms/Main.Designer.cs +++ b/src/ui/Forms/Main.Designer.cs @@ -349,6 +349,7 @@ namespace Nikse.SubtitleEdit.Forms this.genericTranslateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemUnbreakLines = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemAutoBreakLines = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItemEvenlyDistributeLines = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItemSaveSelectedLines = new System.Windows.Forms.ToolStripMenuItem(); this.typeEffectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.karaokeEffectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -576,7 +577,6 @@ namespace Nikse.SubtitleEdit.Forms this.timerOriginalTextUndo = new System.Windows.Forms.Timer(this.components); this.contextMenuStripShowVideoControls = new System.Windows.Forms.ContextMenuStrip(this.components); this.toolStripMenuItemShowVideoControls = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItemEvenlyDistributeLines = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -996,10 +996,11 @@ namespace Nikse.SubtitleEdit.Forms // this.toolStripButtonLayout.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.toolStripButtonLayout.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.toolStripButtonLayout.Image = global::Nikse.SubtitleEdit.Properties.Resources.Layout; this.toolStripButtonLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripButtonLayout.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonLayout.Name = "toolStripButtonLayout"; - this.toolStripButtonLayout.Size = new System.Drawing.Size(23, 37); + this.toolStripButtonLayout.Size = new System.Drawing.Size(36, 37); this.toolStripButtonLayout.Text = "Show/hide waveform"; this.toolStripButtonLayout.Click += new System.EventHandler(this.ToolStripButtonLayoutChooseClick); // @@ -3226,6 +3227,13 @@ namespace Nikse.SubtitleEdit.Forms this.toolStripMenuItemAutoBreakLines.Text = "Auto balance selected lines..."; this.toolStripMenuItemAutoBreakLines.Click += new System.EventHandler(this.ToolStripMenuItemAutoBreakLinesClick); // + // toolStripMenuItemEvenlyDistributeLines + // + this.toolStripMenuItemEvenlyDistributeLines.Name = "toolStripMenuItemEvenlyDistributeLines"; + this.toolStripMenuItemEvenlyDistributeLines.Size = new System.Drawing.Size(275, 22); + this.toolStripMenuItemEvenlyDistributeLines.Text = "Evenly distribute lines (CPS)..."; + this.toolStripMenuItemEvenlyDistributeLines.Click += new System.EventHandler(this.ToolStripMenuItemEvenlyDistributeLinesClick); + // // toolStripMenuItemSaveSelectedLines // this.toolStripMenuItemSaveSelectedLines.Name = "toolStripMenuItemSaveSelectedLines"; @@ -5847,13 +5855,6 @@ namespace Nikse.SubtitleEdit.Forms this.toolStripMenuItemShowVideoControls.Text = "Show video controls"; this.toolStripMenuItemShowVideoControls.Click += new System.EventHandler(this.ToolStripMenuItemShowVideoControlsClick); // - // toolStripMenuItemEvenlyDistributeLines - // - this.toolStripMenuItemEvenlyDistributeLines.Name = "toolStripMenuItemEvenlyDistributeLines"; - this.toolStripMenuItemEvenlyDistributeLines.Size = new System.Drawing.Size(275, 22); - this.toolStripMenuItemEvenlyDistributeLines.Text = "Evenly distribute lines (CPS)..."; - this.toolStripMenuItemEvenlyDistributeLines.Click += new System.EventHandler(this.ToolStripMenuItemEvenlyDistributeLinesClick); - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/src/ui/Forms/Main.resx b/src/ui/Forms/Main.resx index c24bd088c..00439894c 100644 --- a/src/ui/Forms/Main.resx +++ b/src/ui/Forms/Main.resx @@ -730,9 +730,9 @@ iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACJSURBVEhLYxjioPT6M4aKawVQHvEApAekFydIv/6bofx6 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACJSURBVEhLYxjioPT6M4aKawVQHvEApAekFydIu/6bofx6 A5RHPADpAenFCbAZXHk1ACi2nqHi6n44BokhA5INrrpiwFBx/T9Q7DxYHILPg8VAcjBAssEgNsgQdACx - DFXdqMFgMGowlDdqMCUG0yxLgwCowEEugEAFEsWFELGAoME0K+gHP2BgAADj1Bh2gurMTQAAAABJRU5E + DFXdqMFgMGowlDdqMCUG0yxLgwCowEEugEAFEsWFELGAoME0K+gHP2BgAABpZBhW3VPvKwAAAABJRU5E rkJggg== diff --git a/src/ui/Properties/Resources.Designer.cs b/src/ui/Properties/Resources.Designer.cs index 9b17d3945..2a5c7e6f5 100644 --- a/src/ui/Properties/Resources.Designer.cs +++ b/src/ui/Properties/Resources.Designer.cs @@ -280,6 +280,16 @@ namespace Nikse.SubtitleEdit.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Layout { + get { + object obj = ResourceManager.GetObject("Layout", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/src/ui/Properties/Resources.resx b/src/ui/Properties/Resources.resx index 34b18653b..098d605fd 100644 --- a/src/ui/Properties/Resources.resx +++ b/src/ui/Properties/Resources.resx @@ -118,15 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\L2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\L3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\L1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\webvtt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,6 +136,9 @@ ..\Icons\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\L7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\color-picker-small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -154,12 +151,15 @@ ..\Resources\Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\L8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\L2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bookmark22dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\L11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ebu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -196,8 +196,11 @@ ..\Resources\SE.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\L7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\L8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\L1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Help32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,7 +208,7 @@ ..\Resources\Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\L11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Layout.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/src/ui/Resources/Layout.png b/src/ui/Resources/Layout.png new file mode 100644 index 000000000..a4ad93747 Binary files /dev/null and b/src/ui/Resources/Layout.png differ diff --git a/src/ui/SubtitleEdit.csproj b/src/ui/SubtitleEdit.csproj index e37155f06..5975ec30c 100644 --- a/src/ui/SubtitleEdit.csproj +++ b/src/ui/SubtitleEdit.csproj @@ -2597,6 +2597,7 @@ + Designer