Skip to content

Commit 55006c1

Browse files
leplatremleplatrem
authored
Fix #229: remove MMMM for srt calibration (#342)
1 parent fe2a260 commit 55006c1

File tree

4 files changed

+81
-51
lines changed

4 files changed

+81
-51
lines changed

‎resources/M.ass‎

Lines changed: 80 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,80 @@
1-
[Script Info]
2-
; Script generated by Aegisub 2.1.8
3-
; http://www.aegisub.org/
4-
Title: CALIBRATION
5-
ScriptType: v4.00+
6-
WrapStyle: 2
7-
PlayResX: 1024
8-
PlayResY: 480
9-
ScaledBorderAndShadow: yes
10-
Collisions: Normal
11-
Last Style Storage: Default
12-
Video Aspect Ratio: 0
13-
Video Zoom: 6
14-
Video Position: 0
15-
16-
[V4+ Styles]
17-
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
18-
Style: Up-Left,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,7,0,0,0,1
19-
Style: Up-Center,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,8,0,0,0,1
20-
Style: Up-Right,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,9,0,0,0,1
21-
Style: Center-Left,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,4,0,0,0,1
22-
Style: Center,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
23-
Style: Center-Right,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,6,0,0,0,1
24-
Style: Down-Left,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,1,0,0,0,1
25-
Style: Down-Center,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,2,0,0,0,1
26-
Style: Down-Right,Verdana,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,3,0,0,0,1
27-
28-
[Events]
29-
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
30-
Dialogue: 0,0:00:00.00,0:00:12.00,Center,,0000,0000,0000,,Center 1\NCenter 2
31-
Dialogue: 0,0:00:00.00,0:00:10.00,Up-Right,,0000,0000,0000,,Up-Right 1\NUp-Right 2
32-
Dialogue: 0,0:00:00.00,0:00:10.25,Up-Center,,0000,0000,0000,,Up-Center 1\NUp-Center 2
33-
Dialogue: 0,0:00:00.00,0:00:10.50,Up-Left,,0000,0000,0000,,Up-Left 1\NUp-Left 2
34-
Dialogue: 0,0:00:00.00,0:00:10.75,Center-Left,,0000,0000,0000,,Center-Left 1\NCenter-Left 2
35-
Dialogue: 0,0:00:00.00,0:00:11.00,Down-Left,,0000,0000,0000,,Down-Left 1\NDown-Left 2
36-
Dialogue: 0,0:00:00.00,0:00:11.25,Down-Center,,0000,0000,0000,,Down-Center 1\NDown-Center 2
37-
Dialogue: 0,0:00:00.00,0:00:11.50,Down-Right,,0000,0000,0000,,Down-Right 1\NDown-Right 2
38-
Dialogue: 0,0:00:00.00,0:00:11.75,Center-Right,,0000,0000,0000,,Center-Right 1\NCenter-Right 2
1+
[Script Info]
2+
; Script generated by Aegisub 2.1.8
3+
; http://www.aegisub.org/
4+
Title: CALIBRATION
5+
ScriptType: v4.00+
6+
WrapStyle: 2
7+
PlayResX: 1024
8+
PlayResY: 480
9+
ScaledBorderAndShadow: yes
10+
Collisions: Normal
11+
Last Style Storage: Default
12+
Video Aspect Ratio: 0
13+
Video Zoom: 6
14+
Video Position: 0
15+
16+
[V4+ Styles]
17+
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
18+
Style: Up-Left,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,7,0,0,0,1
19+
Style: Up-Center,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,8,0,0,0,1
20+
Style: Up-Right,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,9,0,0,0,1
21+
Style: Center-Left,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,4,0,0,0,1
22+
Style: Center,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
23+
Style: Center-Right,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,6,0,0,0,1
24+
Style: Down-Left,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,1,0,0,0,1
25+
Style: Down-Center,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,2,0,0,0,1
26+
Style: Down-Right,Tiresias Signfont,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,3,0,0,0,1
27+
28+
Style: English,Tiresias Signfont,30,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
29+
Style: Spanish,Tiresias Signfont,30,&H000080FF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
30+
Style: French,Tiresias Signfont,30,&H0000FFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
31+
Style: German,Tiresias Signfont,30,&H0000FF80,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
32+
Style: Italian,Tiresias Signfont,30,&H00FF0000,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
33+
Style: Portuguese,Tiresias Signfont,30,&H0080FF00,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
34+
Style: Russian,Tiresias Signfont,30,&H00FFFF00,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
35+
Style: Hindi,Tiresias Signfont,30,&H00FF8000,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
36+
Style: Japanese,Tiresias Signfont,30,&H00FF0080,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
37+
Style: Chinese,Tiresias Signfont,30,&H00FF00FF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
38+
Style: Korean,Tiresias Signfont,30,&H008000FF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
39+
Style: Arabic,Tiresias Signfont,30,&H008eff9b,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,0,0,0,0,1
40+
Style: Hebrew,Tiresias Signfont,30,&H0000A0FF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
41+
Style: Thai,Tiresias Signfont,30,&H0000FFC0,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
42+
Style: Vietnamese,Tiresias Signfont,30,&H0000FF40,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
43+
Style: Armenian,Tiresias Signfont,30,&H0000C000,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
44+
Style: Kazakh,Tiresias Signfont,30,&H00808080,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
45+
Style: Amharic,Tiresias Signfont,30,&H00C000FF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
46+
Style: Tamil,Tiresias Signfont,30,&H00FF99CC,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
47+
Style: Swedish,Tiresias Signfont,30,&H004000FF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,5,0,0,0,1
48+
49+
[Events]
50+
Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
51+
Dialogue: 0,0:00:00.00,0:00:12.00,Center,,0000,0000,0000,,Center 1\NCenter 2
52+
Dialogue: 0,0:00:00.00,0:00:10.00,Up-Right,,0000,0000,0000,,Up-Right 1\NUp-Right 2
53+
Dialogue: 0,0:00:00.00,0:00:10.25,Up-Center,,0000,0000,0000,,Up-Center 1\NUp-Center 2
54+
Dialogue: 0,0:00:00.00,0:00:10.50,Up-Left,,0000,0000,0000,,Up-Left 1\NUp-Left 2
55+
Dialogue: 0,0:00:00.00,0:00:10.75,Center-Left,,0000,0000,0000,,Center-Left 1\NCenter-Left 2
56+
Dialogue: 0,0:00:00.00,0:00:11.00,Down-Left,,0000,0000,0000,,Down-Left 1\NDown-Left 2
57+
Dialogue: 0,0:00:00.00,0:00:11.25,Down-Center,,0000,0000,0000,,Down-Center 1\NDown-Center 2
58+
Dialogue: 0,0:00:00.00,0:00:11.50,Down-Right,,0000,0000,0000,,Down-Right 1\NDown-Right 2
59+
Dialogue: 0,0:00:00.00,0:00:11.75,Center-Right,,0000,0000,0000,,Center-Right 1\NCenter-Right 2
60+
61+
Dialogue: 0,0:00:12.00,0:00:15.10,English,,0000,0000,0000,,Hello everyone!
62+
Dialogue: 0,0:00:12.00,0:00:15.20,French,,0000,0000,0000,,{\pos(500,250)}Bonjour à tous!
63+
Dialogue: 0,0:00:12.20,0:00:13.40,Spanish,,0000,0000,0000,,{\pos(500,80)}Hola a todos!
64+
Dialogue: 0,0:00:12.30,0:00:13.50,German,,0000,0000,0000,,{\pos(300,200)}Hallo zusammen!
65+
Dialogue: 0,0:00:12.40,0:00:13.60,Italian,,0000,0000,0000,,{\pos(900,150)}Ciao a tutti!
66+
Dialogue: 0,0:00:12.50,0:00:13.70,Portuguese,,0000,0000,0000,,{\pos(120,250)}Olá a todos!
67+
Dialogue: 0,0:00:12.60,0:00:13.80,Russian,,0000,0000,0000,,{\pos(620,50)}Привет всем!
68+
Dialogue: 0,0:00:12.70,0:00:13.90,Hindi,,0000,0000,0000,,{\pos(420,200)}नमस्ते सब लोग!
69+
Dialogue: 0,0:00:12.80,0:00:14.00,Japanese,,0000,0000,0000,,{\pos(700,280)}こんにちは皆さん！
70+
Dialogue: 0,0:00:12.90,0:00:14.10,Chinese,,0000,0000,0000,,{\pos(250,150)}大家好！
71+
Dialogue: 0,0:00:13.00,0:00:14.20,Korean,,0000,0000,0000,,{\pos(850,80)}안녕하세요 여러분!
72+
Dialogue: 0,0:00:13.10,0:00:14.30,Arabic,,0000,0000,0000,,{\pos(200,0)}مرحباً بالجميع!
73+
Dialogue: 0,0:00:13.20,0:00:14.40,Hebrew,,0000,0000,0000,,{\pos(600,200)}שלום לכולם!
74+
Dialogue: 0,0:00:13.30,0:00:14.50,Thai,,0000,0000,0000,,{\pos(350,50)}สวัสดีทุกคน!
75+
Dialogue: 0,0:00:13.40,0:00:14.60,Vietnamese,,0000,0000,0000,,{\pos(500,250)}Chào mọi người!
76+
Dialogue: 0,0:00:13.50,0:00:14.70,Armenian,,0000,0000,0000,,{\pos(950,220)}Բարեւ բոլորին!
77+
Dialogue: 0,0:00:13.60,0:00:14.80,Kazakh,,0000,0000,0000,,{\pos(150,120)}Сәлем, бәріңе!
78+
Dialogue: 0,0:00:13.70,0:00:14.90,Amharic,,0000,0000,0000,,{\pos(720,220)}ሰላም ለሁላችሁ!
79+
Dialogue: 0,0:00:13.80,0:00:15.00,Tamil,,0000,0000,0000,,{\pos(370,100)}வணக்கம் அனைவருக்கும்!
80+
Dialogue: 0,0:00:13.90,0:00:15.10,Swedish,,0000,0000,0000,,{\pos(640,170)}Hej allihopa!

‎resources/M.srt‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎resources/samples.qrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<RCC>
22
<qresource prefix="/samples">
33
<file>M.ass</file>
4-
<file>M.srt</file>
54
</qresource>
65
</RCC>

‎src/mainwindow.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -437,13 +437,7 @@ void MainWindow::actionOperatorPrintout() {
437437

438438
void MainWindow::actionShowCalibration(bool p_state) {
439439
if (p_state) {
440-
QString fileExt = "ass";
441-
if (m_script) {
442-
m_lastScript = m_script->fileName();
443-
if (m_script->format() == Script::SRT)
444-
fileExt = "srt";
445-
}
446-
openFile(QString(":/samples/M.%1").arg(fileExt));
440+
openFile(QString(":/samples/M.ass"));
447441
m_player->jumpTo(0);
448442
m_player->enableAutoHide(false); // disable auto-hide for calibration
449443
actionToggleHide(false);

0 commit comments

Comments
 (0)