Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-24 20:22:41 +01:00
Code Issues Projects Releases Wiki Activity

MergeShortLineLength - more values

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@133 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2010-11-05 21:24:50 +00:00
parent c8ff9ef006
commit c7e46b0585
2 changed files with 28 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/Forms/Settings.Designer.cs generated
View File

@ -317,7 +317,7 @@
this.checkBoxShowFrameRate.AutoSize = true;
this.checkBoxShowFrameRate.Location = new System.Drawing.Point(180, 19);
this.checkBoxShowFrameRate.Name = "checkBoxShowFrameRate";
this.checkBoxShowFrameRate.Size = new System.Drawing.Size(154, 17);
this.checkBoxShowFrameRate.Size = new System.Drawing.Size(149, 17);
this.checkBoxShowFrameRate.TabIndex = 29;
this.checkBoxShowFrameRate.Text = "Show frame rate in toolbar";
this.checkBoxShowFrameRate.UseVisualStyleBackColor = true;
@ -385,7 +385,7 @@
this.checkBoxRememberWindowPosition.AutoSize = true;
this.checkBoxRememberWindowPosition.Location = new System.Drawing.Point(435, 71);
this.checkBoxRememberWindowPosition.Name = "checkBoxRememberWindowPosition";
this.checkBoxRememberWindowPosition.Size = new System.Drawing.Size(223, 17);
this.checkBoxRememberWindowPosition.Size = new System.Drawing.Size(222, 17);
this.checkBoxRememberWindowPosition.TabIndex = 18;
this.checkBoxRememberWindowPosition.Text = "Remember main window position and size";
this.checkBoxRememberWindowPosition.UseVisualStyleBackColor = true;
@ -432,7 +432,7 @@
this.checkBoxStartInSourceView.AutoSize = true;
this.checkBoxStartInSourceView.Location = new System.Drawing.Point(435, 94);
this.checkBoxStartInSourceView.Name = "checkBoxStartInSourceView";
this.checkBoxStartInSourceView.Size = new System.Drawing.Size(121, 17);
this.checkBoxStartInSourceView.Size = new System.Drawing.Size(119, 17);
this.checkBoxStartInSourceView.TabIndex = 20;
this.checkBoxStartInSourceView.Text = "Start in source view";
this.checkBoxStartInSourceView.UseVisualStyleBackColor = true;
@ -442,7 +442,7 @@
this.checkBoxReopenLastOpened.AutoSize = true;
this.checkBoxReopenLastOpened.Location = new System.Drawing.Point(435, 48);
this.checkBoxReopenLastOpened.Name = "checkBoxReopenLastOpened";
this.checkBoxReopenLastOpened.Size = new System.Drawing.Size(145, 17);
this.checkBoxReopenLastOpened.Size = new System.Drawing.Size(140, 17);
this.checkBoxReopenLastOpened.TabIndex = 16;
this.checkBoxReopenLastOpened.Text = "Start with last file loaded";
this.checkBoxReopenLastOpened.UseVisualStyleBackColor = true;
@ -452,7 +452,7 @@
this.checkBoxRememberRecentFiles.AutoSize = true;
this.checkBoxRememberRecentFiles.Location = new System.Drawing.Point(435, 25);
this.checkBoxRememberRecentFiles.Name = "checkBoxRememberRecentFiles";
this.checkBoxRememberRecentFiles.Size = new System.Drawing.Size(195, 17);
this.checkBoxRememberRecentFiles.Size = new System.Drawing.Size(188, 17);
this.checkBoxRememberRecentFiles.TabIndex = 14;
this.checkBoxRememberRecentFiles.Text = "Remember recent files (for reopen)";
this.checkBoxRememberRecentFiles.UseVisualStyleBackColor = true;
@ -462,7 +462,7 @@
this.checkBoxSubtitleFontBold.AutoSize = true;
this.checkBoxSubtitleFontBold.Location = new System.Drawing.Point(180, 222);
this.checkBoxSubtitleFontBold.Name = "checkBoxSubtitleFontBold";
this.checkBoxSubtitleFontBold.Size = new System.Drawing.Size(46, 17);
this.checkBoxSubtitleFontBold.Size = new System.Drawing.Size(47, 17);
this.checkBoxSubtitleFontBold.TabIndex = 12;
this.checkBoxSubtitleFontBold.Text = "Bold";
this.checkBoxSubtitleFontBold.UseVisualStyleBackColor = true;
@ -601,7 +601,7 @@
this.checkBoxHelp.AutoSize = true;
this.checkBoxHelp.Location = new System.Drawing.Point(596, 80);
this.checkBoxHelp.Name = "checkBoxHelp";
this.checkBoxHelp.Size = new System.Drawing.Size(55, 17);
this.checkBoxHelp.Size = new System.Drawing.Size(56, 17);
this.checkBoxHelp.TabIndex = 31;
this.checkBoxHelp.Text = "Visible";
this.checkBoxHelp.UseVisualStyleBackColor = true;
@ -628,7 +628,7 @@
this.checkBoxSettings.AutoSize = true;
this.checkBoxSettings.Location = new System.Drawing.Point(532, 80);
this.checkBoxSettings.Name = "checkBoxSettings";
this.checkBoxSettings.Size = new System.Drawing.Size(55, 17);
this.checkBoxSettings.Size = new System.Drawing.Size(56, 17);
this.checkBoxSettings.TabIndex = 28;
this.checkBoxSettings.Text = "Visible";
this.checkBoxSettings.UseVisualStyleBackColor = true;
@ -655,7 +655,7 @@
this.checkBoxSpellCheck.AutoSize = true;
this.checkBoxSpellCheck.Location = new System.Drawing.Point(464, 80);
this.checkBoxSpellCheck.Name = "checkBoxSpellCheck";
this.checkBoxSpellCheck.Size = new System.Drawing.Size(55, 17);
this.checkBoxSpellCheck.Size = new System.Drawing.Size(56, 17);
this.checkBoxSpellCheck.TabIndex = 26;
this.checkBoxSpellCheck.Text = "Visible";
this.checkBoxSpellCheck.UseVisualStyleBackColor = true;
@ -682,7 +682,7 @@
this.checkBoxVisualSync.AutoSize = true;
this.checkBoxVisualSync.Location = new System.Drawing.Point(398, 80);
this.checkBoxVisualSync.Name = "checkBoxVisualSync";
this.checkBoxVisualSync.Size = new System.Drawing.Size(55, 17);
this.checkBoxVisualSync.Size = new System.Drawing.Size(56, 17);
this.checkBoxVisualSync.TabIndex = 19;
this.checkBoxVisualSync.Text = "Visible";
this.checkBoxVisualSync.UseVisualStyleBackColor = true;
@ -709,7 +709,7 @@
this.checkBoxReplace.AutoSize = true;
this.checkBoxReplace.Location = new System.Drawing.Point(335, 80);
this.checkBoxReplace.Name = "checkBoxReplace";
this.checkBoxReplace.Size = new System.Drawing.Size(55, 17);
this.checkBoxReplace.Size = new System.Drawing.Size(56, 17);
this.checkBoxReplace.TabIndex = 16;
this.checkBoxReplace.Text = "Visible";
this.checkBoxReplace.UseVisualStyleBackColor = true;
@ -736,7 +736,7 @@
this.checkBoxToolbarFind.AutoSize = true;
this.checkBoxToolbarFind.Location = new System.Drawing.Point(272, 80);
this.checkBoxToolbarFind.Name = "checkBoxToolbarFind";
this.checkBoxToolbarFind.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarFind.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarFind.TabIndex = 13;
this.checkBoxToolbarFind.Text = "Visible";
this.checkBoxToolbarFind.UseVisualStyleBackColor = true;
@ -763,7 +763,7 @@
this.checkBoxToolbarSaveAs.AutoSize = true;
this.checkBoxToolbarSaveAs.Location = new System.Drawing.Point(209, 80);
this.checkBoxToolbarSaveAs.Name = "checkBoxToolbarSaveAs";
this.checkBoxToolbarSaveAs.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarSaveAs.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarSaveAs.TabIndex = 10;
this.checkBoxToolbarSaveAs.Text = "Visible";
this.checkBoxToolbarSaveAs.UseVisualStyleBackColor = true;
@ -790,7 +790,7 @@
this.checkBoxToolbarSave.AutoSize = true;
this.checkBoxToolbarSave.Location = new System.Drawing.Point(146, 80);
this.checkBoxToolbarSave.Name = "checkBoxToolbarSave";
this.checkBoxToolbarSave.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarSave.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarSave.TabIndex = 7;
this.checkBoxToolbarSave.Text = "Visible";
this.checkBoxToolbarSave.UseVisualStyleBackColor = true;
@ -817,7 +817,7 @@
this.checkBoxToolbarOpen.AutoSize = true;
this.checkBoxToolbarOpen.Location = new System.Drawing.Point(83, 80);
this.checkBoxToolbarOpen.Name = "checkBoxToolbarOpen";
this.checkBoxToolbarOpen.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarOpen.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarOpen.TabIndex = 4;
this.checkBoxToolbarOpen.Text = "Visible";
this.checkBoxToolbarOpen.UseVisualStyleBackColor = true;
@ -844,7 +844,7 @@
this.checkBoxToolbarNew.AutoSize = true;
this.checkBoxToolbarNew.Location = new System.Drawing.Point(20, 80);
this.checkBoxToolbarNew.Name = "checkBoxToolbarNew";
this.checkBoxToolbarNew.Size = new System.Drawing.Size(55, 17);
this.checkBoxToolbarNew.Size = new System.Drawing.Size(56, 17);
this.checkBoxToolbarNew.TabIndex = 1;
this.checkBoxToolbarNew.Text = "Visible";
this.checkBoxToolbarNew.UseVisualStyleBackColor = true;
@ -921,7 +921,7 @@
this.checkBoxVideoPlayerShowStopButton.AutoSize = true;
this.checkBoxVideoPlayerShowStopButton.Location = new System.Drawing.Point(9, 19);
this.checkBoxVideoPlayerShowStopButton.Name = "checkBoxVideoPlayerShowStopButton";
this.checkBoxVideoPlayerShowStopButton.Size = new System.Drawing.Size(111, 17);
this.checkBoxVideoPlayerShowStopButton.Size = new System.Drawing.Size(109, 17);
this.checkBoxVideoPlayerShowStopButton.TabIndex = 10;
this.checkBoxVideoPlayerShowStopButton.Text = "Show stop button";
this.checkBoxVideoPlayerShowStopButton.UseVisualStyleBackColor = true;
@ -988,7 +988,7 @@
this.radioButtonVideoPlayerVLC.AutoSize = true;
this.radioButtonVideoPlayerVLC.Location = new System.Drawing.Point(10, 46);
this.radioButtonVideoPlayerVLC.Name = "radioButtonVideoPlayerVLC";
this.radioButtonVideoPlayerVLC.Size = new System.Drawing.Size(43, 17);
this.radioButtonVideoPlayerVLC.Size = new System.Drawing.Size(45, 17);
this.radioButtonVideoPlayerVLC.TabIndex = 4;
this.radioButtonVideoPlayerVLC.TabStop = true;
this.radioButtonVideoPlayerVLC.Text = "VLC";
@ -1033,7 +1033,7 @@
this.radioButtonVideoPlayerWmp.AutoSize = true;
this.radioButtonVideoPlayerWmp.Location = new System.Drawing.Point(10, 67);
this.radioButtonVideoPlayerWmp.Name = "radioButtonVideoPlayerWmp";
this.radioButtonVideoPlayerWmp.Size = new System.Drawing.Size(132, 17);
this.radioButtonVideoPlayerWmp.Size = new System.Drawing.Size(133, 17);
this.radioButtonVideoPlayerWmp.TabIndex = 8;
this.radioButtonVideoPlayerWmp.TabStop = true;
this.radioButtonVideoPlayerWmp.Text = "Windows Media Player";
@ -1044,7 +1044,7 @@
this.radioButtonVideoPlayerDirectShow.AutoSize = true;
this.radioButtonVideoPlayerDirectShow.Location = new System.Drawing.Point(10, 23);
this.radioButtonVideoPlayerDirectShow.Name = "radioButtonVideoPlayerDirectShow";
this.radioButtonVideoPlayerDirectShow.Size = new System.Drawing.Size(82, 17);
this.radioButtonVideoPlayerDirectShow.Size = new System.Drawing.Size(83, 17);
this.radioButtonVideoPlayerDirectShow.TabIndex = 1;
this.radioButtonVideoPlayerDirectShow.TabStop = true;
this.radioButtonVideoPlayerDirectShow.Text = "DirectShow ";
@ -1055,7 +1055,7 @@
this.radioButtonVideoPlayerManagedDirectX.AutoSize = true;
this.radioButtonVideoPlayerManagedDirectX.Location = new System.Drawing.Point(10, 90);
this.radioButtonVideoPlayerManagedDirectX.Name = "radioButtonVideoPlayerManagedDirectX";
this.radioButtonVideoPlayerManagedDirectX.Size = new System.Drawing.Size(106, 17);
this.radioButtonVideoPlayerManagedDirectX.Size = new System.Drawing.Size(108, 17);
this.radioButtonVideoPlayerManagedDirectX.TabIndex = 6;
this.radioButtonVideoPlayerManagedDirectX.TabStop = true;
this.radioButtonVideoPlayerManagedDirectX.Text = "Managed DirectX";
@ -1250,7 +1250,7 @@
this.checkBoxSpellCheckAutoChangeNames.AutoSize = true;
this.checkBoxSpellCheckAutoChangeNames.Location = new System.Drawing.Point(15, 20);
this.checkBoxSpellCheckAutoChangeNames.Name = "checkBoxSpellCheckAutoChangeNames";
this.checkBoxSpellCheckAutoChangeNames.Size = new System.Drawing.Size(216, 17);
this.checkBoxSpellCheckAutoChangeNames.Size = new System.Drawing.Size(209, 17);
this.checkBoxSpellCheckAutoChangeNames.TabIndex = 0;
this.checkBoxSpellCheckAutoChangeNames.Text = "Auto fix names where only casing differ";
this.checkBoxSpellCheckAutoChangeNames.UseVisualStyleBackColor = true;
@ -1323,48 +1323,6 @@
//
this.comboBoxMergeShortLineLength.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxMergeShortLineLength.FormattingEnabled = true;
this.comboBoxMergeShortLineLength.Items.AddRange(new object[] {
"10",
"11",
"12",
"13",
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
"29",
"30",
"31",
"32",
"33",
"34",
"35",
"36",
"37",
"38",
"39",
"40",
"41",
"42",
"43",
"44",
"45",
"46",
"47",
"48",
"49",
"50"});
this.comboBoxMergeShortLineLength.Location = new System.Drawing.Point(196, 27);
this.comboBoxMergeShortLineLength.Name = "comboBoxMergeShortLineLength";
this.comboBoxMergeShortLineLength.Size = new System.Drawing.Size(73, 21);
@ -1608,7 +1566,7 @@
this.checkBoxNamesEtcOnline.AutoSize = true;
this.checkBoxNamesEtcOnline.Location = new System.Drawing.Point(7, 22);
this.checkBoxNamesEtcOnline.Name = "checkBoxNamesEtcOnline";
this.checkBoxNamesEtcOnline.Size = new System.Drawing.Size(163, 17);
this.checkBoxNamesEtcOnline.Size = new System.Drawing.Size(162, 17);
this.checkBoxNamesEtcOnline.TabIndex = 26;
this.checkBoxNamesEtcOnline.Text = "Use online names etc xml file";
this.checkBoxNamesEtcOnline.UseVisualStyleBackColor = true;

5
src/Forms/Settings.cs
View File

@ -289,6 +289,11 @@ namespace Nikse.SubtitleEdit.Forms
comboBoxToolsEndSceneIndex.SelectedIndex = toolsSettings.EndSceneIndex;
else
comboBoxToolsEndSceneIndex.SelectedIndex = 0;
comboBoxMergeShortLineLength.Items.Clear();
for (int i = 10; i < 100; i++)
comboBoxMergeShortLineLength.Items.Add(i.ToString());
if (toolsSettings.MergeLinesShorterThan >= 10 && toolsSettings.MergeLinesShorterThan - 10 < comboBoxMergeShortLineLength.Items.Count)
comboBoxMergeShortLineLength.SelectedIndex = toolsSettings.MergeLinesShorterThan - 10;
else