diff --git a/src/Forms/Main.Designer.cs b/src/Forms/Main.Designer.cs index b9f2be2bc..5f8077e3f 100644 --- a/src/Forms/Main.Designer.cs +++ b/src/Forms/Main.Designer.cs @@ -108,6 +108,8 @@ this.replaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.multipleReplaceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gotoLineNumberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripMenuItemRightToLeftMode = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); this.editSelectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -1051,6 +1053,8 @@ this.replaceToolStripMenuItem, this.multipleReplaceToolStripMenuItem, this.gotoLineNumberToolStripMenuItem, + this.toolStripSeparator25, + this.toolStripMenuItemRightToLeftMode, this.toolStripSeparator21, this.editSelectAllToolStripMenuItem}); this.editToolStripMenuItem.Name = "editToolStripMenuItem"; @@ -1061,31 +1065,31 @@ // showHistoryforUndoToolStripMenuItem // this.showHistoryforUndoToolStripMenuItem.Name = "showHistoryforUndoToolStripMenuItem"; - this.showHistoryforUndoToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.showHistoryforUndoToolStripMenuItem.Size = new System.Drawing.Size(271, 22); this.showHistoryforUndoToolStripMenuItem.Text = "Show history (for undo)"; this.showHistoryforUndoToolStripMenuItem.Click += new System.EventHandler(this.ShowHistoryforUndoToolStripMenuItemClick); // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(219, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(268, 6); // // toolStripMenuItemInsertUnicodeCharacter // this.toolStripMenuItemInsertUnicodeCharacter.Name = "toolStripMenuItemInsertUnicodeCharacter"; - this.toolStripMenuItemInsertUnicodeCharacter.Size = new System.Drawing.Size(222, 22); + this.toolStripMenuItemInsertUnicodeCharacter.Size = new System.Drawing.Size(271, 22); this.toolStripMenuItemInsertUnicodeCharacter.Text = "Insert unicode character"; // // toolStripSeparatorInsertUnicodeCharacter // this.toolStripSeparatorInsertUnicodeCharacter.Name = "toolStripSeparatorInsertUnicodeCharacter"; - this.toolStripSeparatorInsertUnicodeCharacter.Size = new System.Drawing.Size(219, 6); + this.toolStripSeparatorInsertUnicodeCharacter.Size = new System.Drawing.Size(268, 6); // // findToolStripMenuItem // this.findToolStripMenuItem.Name = "findToolStripMenuItem"; this.findToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F))); - this.findToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.findToolStripMenuItem.Size = new System.Drawing.Size(271, 22); this.findToolStripMenuItem.Text = "Find"; this.findToolStripMenuItem.Click += new System.EventHandler(this.FindToolStripMenuItemClick); // @@ -1093,7 +1097,7 @@ // this.findNextToolStripMenuItem.Name = "findNextToolStripMenuItem"; this.findNextToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.findNextToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.findNextToolStripMenuItem.Size = new System.Drawing.Size(271, 22); this.findNextToolStripMenuItem.Text = "Find next"; this.findNextToolStripMenuItem.Click += new System.EventHandler(this.FindNextToolStripMenuItemClick); // @@ -1101,14 +1105,14 @@ // this.replaceToolStripMenuItem.Name = "replaceToolStripMenuItem"; this.replaceToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.H))); - this.replaceToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.replaceToolStripMenuItem.Size = new System.Drawing.Size(271, 22); this.replaceToolStripMenuItem.Text = "Replace"; this.replaceToolStripMenuItem.Click += new System.EventHandler(this.ReplaceToolStripMenuItemClick); // // multipleReplaceToolStripMenuItem // this.multipleReplaceToolStripMenuItem.Name = "multipleReplaceToolStripMenuItem"; - this.multipleReplaceToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.multipleReplaceToolStripMenuItem.Size = new System.Drawing.Size(271, 22); this.multipleReplaceToolStripMenuItem.Text = "Multiple replace"; this.multipleReplaceToolStripMenuItem.Click += new System.EventHandler(this.MultipleReplaceToolStripMenuItemClick); // @@ -1116,19 +1120,31 @@ // this.gotoLineNumberToolStripMenuItem.Name = "gotoLineNumberToolStripMenuItem"; this.gotoLineNumberToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); - this.gotoLineNumberToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.gotoLineNumberToolStripMenuItem.Size = new System.Drawing.Size(271, 22); this.gotoLineNumberToolStripMenuItem.Text = "Goto line number..."; this.gotoLineNumberToolStripMenuItem.Click += new System.EventHandler(this.GotoLineNumberToolStripMenuItemClick); // + // toolStripSeparator25 + // + this.toolStripSeparator25.Name = "toolStripSeparator25"; + this.toolStripSeparator25.Size = new System.Drawing.Size(268, 6); + // + // toolStripMenuItemRightToLeftMode + // + this.toolStripMenuItemRightToLeftMode.Name = "toolStripMenuItemRightToLeftMode"; + this.toolStripMenuItemRightToLeftMode.Size = new System.Drawing.Size(222, 22); + this.toolStripMenuItemRightToLeftMode.Text = "Right to left mode"; + this.toolStripMenuItemRightToLeftMode.Click += new System.EventHandler(this.ToolStripMenuItemRightToLeftModeClick); + // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(219, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(268, 6); // // editSelectAllToolStripMenuItem // this.editSelectAllToolStripMenuItem.Name = "editSelectAllToolStripMenuItem"; - this.editSelectAllToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.editSelectAllToolStripMenuItem.Size = new System.Drawing.Size(271, 22); this.editSelectAllToolStripMenuItem.Text = "Select all"; this.editSelectAllToolStripMenuItem.Click += new System.EventHandler(this.EditSelectAllToolStripMenuItemClick); // @@ -4113,6 +4129,8 @@ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemRight; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemApplyDurationLimits; private System.Windows.Forms.ToolStripMenuItem generateDatetimeInfoFromVideoToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator25; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemRightToLeftMode; } } diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index e8ddc75ef..4af0e878f 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -1086,6 +1086,7 @@ namespace Nikse.SubtitleEdit.Forms replaceToolStripMenuItem.Text = _language.Menu.Edit.Replace; multipleReplaceToolStripMenuItem.Text = _language.Menu.Edit.MultipleReplace; gotoLineNumberToolStripMenuItem.Text = _language.Menu.Edit.GoToSubtitleNumber; + toolStripMenuItemRightToLeftMode.Text = Configuration.Settings.Language.VobSubOcr.RightToLeft; //TODO: SE 3.3 new language tag editSelectAllToolStripMenuItem.Text = _language.Menu.ContextMenu.SelectAll; toolsToolStripMenuItem.Text = _language.Menu.Tools.Title; @@ -7882,25 +7883,6 @@ namespace Nikse.SubtitleEdit.Forms Beamer beamer = new Beamer(this, _subtitle, _subtitleListViewIndex); beamer.ShowDialog(this); } - else if (e.Modifiers == (Keys.Control | Keys.Alt | Keys.Shift) && e.KeyCode == Keys.R) // Ctrl+Alt+Shift+R = Toggle RightToLeft - { - if (textBoxListViewText.RightToLeft == System.Windows.Forms.RightToLeft.Yes) - { - textBoxListViewText.RightToLeft = System.Windows.Forms.RightToLeft.No; - SubtitleListview1.RightToLeft = System.Windows.Forms.RightToLeft.No; - textBoxSource.RightToLeft = System.Windows.Forms.RightToLeft.No; - if (mediaPlayer != null) - mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; - } - else - { - textBoxListViewText.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - SubtitleListview1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - textBoxSource.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - if (mediaPlayer != null) - mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.Yes; - } - } else if (e.KeyData == _mainVideoFullscreen) // fullscreen { if (_videoPlayerUnDocked == null || _videoPlayerUnDocked.IsDisposed) @@ -10321,6 +10303,7 @@ namespace Nikse.SubtitleEdit.Forms toolStripMenuItemAlignMiddle.Visible = true; toolStripMenuItemLeft.Visible = true; toolStripMenuItemRight.Visible = true; +// toolStripMenuItemRightToLeftMode.Visible = true; } else { @@ -10330,6 +10313,7 @@ namespace Nikse.SubtitleEdit.Forms toolStripMenuItemAlignMiddle.Visible = false; toolStripMenuItemLeft.Visible = false; toolStripMenuItemRight.Visible = false; + // toolStripMenuItemRightToLeftMode.Visible = false; } } @@ -10372,6 +10356,7 @@ namespace Nikse.SubtitleEdit.Forms replaceToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditReplace); multipleReplaceToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditMultipleReplace); gotoLineNumberToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditGoToLineNumber); + toolStripMenuItemRightToLeftMode.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainEditRightToLeft); fixToolStripMenuItem.ShortcutKeys = Utilities.GetKeys(Configuration.Settings.Shortcuts.MainToolsFixCommonErrors); @@ -13547,5 +13532,26 @@ namespace Nikse.SubtitleEdit.Forms _formPositionsAndSizes.SavePositionAndSize(extractDateTimeInfo); } + private void ToolStripMenuItemRightToLeftModeClick(object sender, EventArgs e) + { + toolStripMenuItemRightToLeftMode.Checked = !toolStripMenuItemRightToLeftMode.Checked; + if (textBoxListViewText.RightToLeft == System.Windows.Forms.RightToLeft.Yes) + { + textBoxListViewText.RightToLeft = System.Windows.Forms.RightToLeft.No; + SubtitleListview1.RightToLeft = System.Windows.Forms.RightToLeft.No; + textBoxSource.RightToLeft = System.Windows.Forms.RightToLeft.No; + if (mediaPlayer != null) + mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; + } + else + { + textBoxListViewText.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + SubtitleListview1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + textBoxSource.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + if (mediaPlayer != null) + mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.Yes; + } + } + } } \ No newline at end of file diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx index c0426ac6d..317a34533 100644 --- a/src/Forms/Main.resx +++ b/src/Forms/Main.resx @@ -574,6 +574,9 @@ 208, 56 + + 208, 56 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -681,7 +684,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 - CAAAAk1TRnQBSQFMAgEBAgEAARABEgEQARIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATgBEgE4ARIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/src/Forms/Settings.cs b/src/Forms/Settings.cs index 863b24e7f..19993cf23 100644 --- a/src/Forms/Settings.cs +++ b/src/Forms/Settings.cs @@ -470,6 +470,7 @@ namespace Nikse.SubtitleEdit.Forms editNode.Nodes.Add(Configuration.Settings.Language.Main.Menu.Edit.Replace + GetShortcutText(Configuration.Settings.Shortcuts.MainEditReplace)); editNode.Nodes.Add(Configuration.Settings.Language.Main.Menu.Edit.MultipleReplace + GetShortcutText(Configuration.Settings.Shortcuts.MainEditMultipleReplace)); editNode.Nodes.Add(Configuration.Settings.Language.Main.Menu.Edit.GoToSubtitleNumber + GetShortcutText(Configuration.Settings.Shortcuts.MainEditGoToLineNumber)); + editNode.Nodes.Add(Configuration.Settings.Language.VobSubOcr.RightToLeft + GetShortcutText(Configuration.Settings.Shortcuts.MainEditRightToLeft)); treeViewShortcuts.Nodes.Add(editNode); var toolsNode = new TreeNode(Configuration.Settings.Language.Main.Menu.Tools.Title); @@ -944,6 +945,8 @@ namespace Nikse.SubtitleEdit.Forms Configuration.Settings.Shortcuts.MainEditMultipleReplace = GetShortcut(node.Text); else if (text == Configuration.Settings.Language.Main.Menu.Edit.GoToSubtitleNumber.Replace("&", string.Empty)) Configuration.Settings.Shortcuts.MainEditGoToLineNumber = GetShortcut(node.Text); + else if (text == Configuration.Settings.Language.VobSubOcr.RightToLeft.Replace("&", string.Empty)) + Configuration.Settings.Shortcuts.MainEditRightToLeft = GetShortcut(node.Text); } } diff --git a/src/Forms/Split.Designer.cs b/src/Forms/Split.Designer.cs new file mode 100644 index 000000000..5dff9a2db --- /dev/null +++ b/src/Forms/Split.Designer.cs @@ -0,0 +1,287 @@ +namespace Nikse.SubtitleEdit.Forms +{ + partial class Split + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBoxParts = new System.Windows.Forms.GroupBox(); + this.RadioButtonLines = new System.Windows.Forms.RadioButton(); + this.radioButtonTime = new System.Windows.Forms.RadioButton(); + this.numericUpDownParts = new System.Windows.Forms.NumericUpDown(); + this.labelNumberOfParts = new System.Windows.Forms.Label(); + this.groupBoxOutput = new System.Windows.Forms.GroupBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); + this.buttonChooseFolder = new System.Windows.Forms.Button(); + this.labelChooseOutputFolder = new System.Windows.Forms.Label(); + this.labelOutputFormat = new System.Windows.Forms.Label(); + this.groupBoxPreview = new System.Windows.Forms.GroupBox(); + this.comboBoxOutputFormat = new System.Windows.Forms.ComboBox(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonSplit = new System.Windows.Forms.Button(); + this.listViewFixes = new System.Windows.Forms.ListView(); + this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.groupBoxParts.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownParts)).BeginInit(); + this.groupBoxOutput.SuspendLayout(); + this.groupBoxPreview.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxParts + // + this.groupBoxParts.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBoxParts.Controls.Add(this.labelNumberOfParts); + this.groupBoxParts.Controls.Add(this.numericUpDownParts); + this.groupBoxParts.Controls.Add(this.radioButtonTime); + this.groupBoxParts.Controls.Add(this.RadioButtonLines); + this.groupBoxParts.Location = new System.Drawing.Point(13, 13); + this.groupBoxParts.Name = "groupBoxParts"; + this.groupBoxParts.Size = new System.Drawing.Size(457, 71); + this.groupBoxParts.TabIndex = 0; + this.groupBoxParts.TabStop = false; + this.groupBoxParts.Text = "Number of parts"; + // + // RadioButtonLines + // + this.RadioButtonLines.AutoSize = true; + this.RadioButtonLines.Checked = true; + this.RadioButtonLines.Location = new System.Drawing.Point(15, 20); + this.RadioButtonLines.Name = "RadioButtonLines"; + this.RadioButtonLines.Size = new System.Drawing.Size(50, 17); + this.RadioButtonLines.TabIndex = 0; + this.RadioButtonLines.TabStop = true; + this.RadioButtonLines.Text = "Lines"; + this.RadioButtonLines.UseVisualStyleBackColor = true; + // + // radioButtonTime + // + this.radioButtonTime.AutoSize = true; + this.radioButtonTime.Location = new System.Drawing.Point(15, 43); + this.radioButtonTime.Name = "radioButtonTime"; + this.radioButtonTime.Size = new System.Drawing.Size(48, 17); + this.radioButtonTime.TabIndex = 1; + this.radioButtonTime.Text = "Time"; + this.radioButtonTime.UseVisualStyleBackColor = true; + // + // numericUpDownParts + // + this.numericUpDownParts.Location = new System.Drawing.Point(117, 38); + this.numericUpDownParts.Minimum = new decimal(new int[] { + 2, + 0, + 0, + 0}); + this.numericUpDownParts.Name = "numericUpDownParts"; + this.numericUpDownParts.Size = new System.Drawing.Size(50, 20); + this.numericUpDownParts.TabIndex = 2; + this.numericUpDownParts.Value = new decimal(new int[] { + 2, + 0, + 0, + 0}); + // + // labelNumberOfParts + // + this.labelNumberOfParts.AutoSize = true; + this.labelNumberOfParts.Location = new System.Drawing.Point(114, 22); + this.labelNumberOfParts.Name = "labelNumberOfParts"; + this.labelNumberOfParts.Size = new System.Drawing.Size(111, 13); + this.labelNumberOfParts.TabIndex = 3; + this.labelNumberOfParts.Text = "Number of equal parts"; + // + // groupBoxOutput + // + this.groupBoxOutput.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBoxOutput.Controls.Add(this.comboBoxOutputFormat); + this.groupBoxOutput.Controls.Add(this.labelOutputFormat); + this.groupBoxOutput.Controls.Add(this.labelChooseOutputFolder); + this.groupBoxOutput.Controls.Add(this.buttonChooseFolder); + this.groupBoxOutput.Controls.Add(this.textBox1); + this.groupBoxOutput.Location = new System.Drawing.Point(16, 90); + this.groupBoxOutput.Name = "groupBoxOutput"; + this.groupBoxOutput.Size = new System.Drawing.Size(457, 106); + this.groupBoxOutput.TabIndex = 1; + this.groupBoxOutput.TabStop = false; + this.groupBoxOutput.Text = "Output"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(7, 39); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(402, 20); + this.textBox1.TabIndex = 0; + // + // buttonChooseFolder + // + this.buttonChooseFolder.Location = new System.Drawing.Point(415, 37); + this.buttonChooseFolder.Name = "buttonChooseFolder"; + this.buttonChooseFolder.Size = new System.Drawing.Size(26, 23); + this.buttonChooseFolder.TabIndex = 1; + this.buttonChooseFolder.Text = "..."; + this.buttonChooseFolder.UseVisualStyleBackColor = true; + // + // labelChooseOutputFolder + // + this.labelChooseOutputFolder.AutoSize = true; + this.labelChooseOutputFolder.Location = new System.Drawing.Point(6, 23); + this.labelChooseOutputFolder.Name = "labelChooseOutputFolder"; + this.labelChooseOutputFolder.Size = new System.Drawing.Size(105, 13); + this.labelChooseOutputFolder.TabIndex = 4; + this.labelChooseOutputFolder.Text = "Choose output folder"; + // + // labelOutputFormat + // + this.labelOutputFormat.AutoSize = true; + this.labelOutputFormat.Location = new System.Drawing.Point(6, 72); + this.labelOutputFormat.Name = "labelOutputFormat"; + this.labelOutputFormat.Size = new System.Drawing.Size(71, 13); + this.labelOutputFormat.TabIndex = 5; + this.labelOutputFormat.Text = "Output format"; + // + // groupBoxPreview + // + this.groupBoxPreview.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.groupBoxPreview.Controls.Add(this.listViewFixes); + this.groupBoxPreview.Location = new System.Drawing.Point(13, 202); + this.groupBoxPreview.Name = "groupBoxPreview"; + this.groupBoxPreview.Size = new System.Drawing.Size(460, 148); + this.groupBoxPreview.TabIndex = 2; + this.groupBoxPreview.TabStop = false; + this.groupBoxPreview.Text = "Prevew"; + // + // comboBoxOutputFormat + // + this.comboBoxOutputFormat.FormattingEnabled = true; + this.comboBoxOutputFormat.Location = new System.Drawing.Point(84, 72); + this.comboBoxOutputFormat.Name = "comboBoxOutputFormat"; + this.comboBoxOutputFormat.Size = new System.Drawing.Size(325, 21); + this.comboBoxOutputFormat.TabIndex = 6; + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.buttonCancel.Location = new System.Drawing.Point(398, 356); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 21); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "C&ancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonSplit + // + this.buttonSplit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonSplit.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.buttonSplit.Location = new System.Drawing.Point(317, 356); + this.buttonSplit.Name = "buttonSplit"; + this.buttonSplit.Size = new System.Drawing.Size(75, 21); + this.buttonSplit.TabIndex = 3; + this.buttonSplit.Text = "&Split"; + this.buttonSplit.UseVisualStyleBackColor = true; + // + // listViewFixes + // + this.listViewFixes.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader4, + this.columnHeader5, + this.columnHeader6}); + this.listViewFixes.Dock = System.Windows.Forms.DockStyle.Fill; + this.listViewFixes.FullRowSelect = true; + this.listViewFixes.HideSelection = false; + this.listViewFixes.Location = new System.Drawing.Point(3, 16); + this.listViewFixes.Name = "listViewFixes"; + this.listViewFixes.Size = new System.Drawing.Size(454, 129); + this.listViewFixes.TabIndex = 101; + this.listViewFixes.UseCompatibleStateImageBehavior = false; + this.listViewFixes.View = System.Windows.Forms.View.Details; + // + // columnHeader4 + // + this.columnHeader4.Text = "File name"; + this.columnHeader4.Width = 280; + // + // columnHeader5 + // + this.columnHeader5.Text = "#Lines"; + this.columnHeader5.Width = 61; + // + // columnHeader6 + // + this.columnHeader6.Text = "Time"; + this.columnHeader6.Width = 61; + // + // Split + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(485, 388); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSplit); + this.Controls.Add(this.groupBoxPreview); + this.Controls.Add(this.groupBoxOutput); + this.Controls.Add(this.groupBoxParts); + this.Name = "Split"; + this.Text = "Split"; + this.groupBoxParts.ResumeLayout(false); + this.groupBoxParts.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownParts)).EndInit(); + this.groupBoxOutput.ResumeLayout(false); + this.groupBoxOutput.PerformLayout(); + this.groupBoxPreview.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBoxParts; + private System.Windows.Forms.Label labelNumberOfParts; + private System.Windows.Forms.NumericUpDown numericUpDownParts; + private System.Windows.Forms.RadioButton radioButtonTime; + private System.Windows.Forms.RadioButton RadioButtonLines; + private System.Windows.Forms.GroupBox groupBoxOutput; + private System.Windows.Forms.ComboBox comboBoxOutputFormat; + private System.Windows.Forms.Label labelOutputFormat; + private System.Windows.Forms.Label labelChooseOutputFolder; + private System.Windows.Forms.Button buttonChooseFolder; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; + private System.Windows.Forms.GroupBox groupBoxPreview; + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.Button buttonSplit; + private System.Windows.Forms.ListView listViewFixes; + private System.Windows.Forms.ColumnHeader columnHeader4; + private System.Windows.Forms.ColumnHeader columnHeader5; + private System.Windows.Forms.ColumnHeader columnHeader6; + } +} \ No newline at end of file diff --git a/src/Forms/Split.cs b/src/Forms/Split.cs new file mode 100644 index 000000000..0948f8884 --- /dev/null +++ b/src/Forms/Split.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace Nikse.SubtitleEdit.Forms +{ + public partial class Split : Form + { + public Split() + { + InitializeComponent(); + } + } +} diff --git a/src/Forms/Split.resx b/src/Forms/Split.resx new file mode 100644 index 000000000..6d8c4f07e --- /dev/null +++ b/src/Forms/Split.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/src/Logic/Settings.cs b/src/Logic/Settings.cs index d42911cde..1a0e788fa 100644 --- a/src/Logic/Settings.cs +++ b/src/Logic/Settings.cs @@ -486,6 +486,7 @@ namespace Nikse.SubtitleEdit.Logic public string MainEditReplace { get; set; } public string MainEditMultipleReplace { get; set; } public string MainEditGoToLineNumber { get; set; } + public string MainEditRightToLeft { get; set; } public string MainToolsFixCommonErrors { get; set; } public string MainVideoPause { get; set; } public string MainVideoPlayPauseToggle { get; set; } @@ -542,6 +543,7 @@ namespace Nikse.SubtitleEdit.Logic MainEditReplace = "Control+H"; MainEditMultipleReplace = string.Empty; MainEditGoToLineNumber = "Control+G"; + MainEditRightToLeft = "Control+Shift+Alt+R"; MainToolsFixCommonErrors = "Control+Shift+F"; MainVideoPlayPauseToggle = "Control+P"; MainVideoPause = "Control+Alt+P"; @@ -1378,6 +1380,9 @@ namespace Nikse.SubtitleEdit.Logic subNode = node.SelectSingleNode("MainEditGoToLineNumber"); if (subNode != null) settings.Shortcuts.MainEditGoToLineNumber = subNode.InnerText; + subNode = node.SelectSingleNode("MainEditRightToLeft"); + if (subNode != null) + settings.Shortcuts.MainEditRightToLeft = subNode.InnerText; subNode = node.SelectSingleNode("MainToolsFixCommonErrors"); if (subNode != null) settings.Shortcuts.MainToolsFixCommonErrors = subNode.InnerText; @@ -1825,6 +1830,7 @@ namespace Nikse.SubtitleEdit.Logic textWriter.WriteElementString("MainEditReplace", settings.Shortcuts.MainEditReplace); textWriter.WriteElementString("MainEditMultipleReplace", settings.Shortcuts.MainEditMultipleReplace); textWriter.WriteElementString("MainEditGoToLineNumber", settings.Shortcuts.MainEditGoToLineNumber); + textWriter.WriteElementString("MainEditRightToLeft", settings.Shortcuts.MainEditRightToLeft); textWriter.WriteElementString("MainToolsFixCommonErrors", settings.Shortcuts.MainToolsFixCommonErrors); textWriter.WriteElementString("MainVideoPause", settings.Shortcuts.MainVideoPause); textWriter.WriteElementString("MainVideoPlayPauseToggle", settings.Shortcuts.MainVideoPlayPauseToggle); diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index bc1c2bac3..881d82b52 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -31,4 +31,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.2.7.*")] +[assembly: AssemblyVersion("3.2.8.*")] diff --git a/src/SubtitleEdit.csproj b/src/SubtitleEdit.csproj index 4d362e0ad..f0b86ec4c 100644 --- a/src/SubtitleEdit.csproj +++ b/src/SubtitleEdit.csproj @@ -392,6 +392,12 @@ SpellCheck.cs + + Form + + + Split.cs + Form @@ -899,6 +905,9 @@ SpellCheck.cs Designer + + Split.cs + SplitLongLines.cs