Skip to content

Commit d286347

Browse files
leplatremleplatrem
committed
Rename Style to SubtitleStyle
1 parent 6cb6c15 commit d286347

File tree

13 files changed

+95
-90
lines changed

13 files changed

+95
-90
lines changed

‎src/script.cpp‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@ int Script::charsRate() const { return m_charsRate; };
101101
int Script::subtitleInterval() const { return m_subtitleInterval; };
102102
int Script::subtitleMinDuration() const { return m_subtitleMinDuration; };
103103

104-
Style *Script::style(const QString &p_name) const {
104+
SubtitleStyle *Script::style(const QString &p_name) const {
105105
// If style is unknown, return first one.
106106
if (!m_styles.contains(p_name))
107107
return m_styles[m_styles.keys().at(0)];
108108
return m_styles[p_name];
109109
}
110110

111-
QList<Style *> Script::styles() const { return m_styles.values(); }
111+
QList<SubtitleStyle *> Script::styles() const { return m_styles.values(); }
112112

113113
int Script::subtitlesCount() const { return m_subtitles.size(); }
114114

@@ -249,7 +249,7 @@ void Script::loadFromAss(QStringList content) {
249249
if (alignment % 3 == 2)
250250
position |= Qt::AlignHCenter;
251251

252-
Style *style = new Style(name, font, color, this);
252+
SubtitleStyle *style = new SubtitleStyle(name, font, color, this);
253253
style->setAlignment(position);
254254
style->setMargins(marginL, marginR, marginV);
255255
m_styles[style->name()] = style;
@@ -271,7 +271,7 @@ void Script::loadFromAss(QStringList content) {
271271
int end =
272272
QTime(0, 0, 0).msecsTo(QTime::fromString(subparts[2], "h:mm:ss.z"));
273273

274-
Style *style = this->style(subparts[3].trimmed());
274+
SubtitleStyle *style = this->style(subparts[3].trimmed());
275275
int marginL = subparts[5].toInt();
276276
int marginR = subparts[6].toInt();
277277
int marginV = subparts[7].toInt();
@@ -364,7 +364,8 @@ void Script::loadFromSrt(QStringList content) {
364364
QFont font(DEFAULT_FONT_NAME);
365365
font.setPixelSize(DEFAULT_FONT_SIZE);
366366

367-
Style *style = new Style(tr("Default"), font, Qt::white, this);
367+
SubtitleStyle *style =
368+
new SubtitleStyle(tr("Default"), font, Qt::white, this);
368369
m_styles[style->name()] = style;
369370

370371
// Make sure its ends with empty line
@@ -411,7 +412,8 @@ void Script::loadFromTxt(QStringList content) {
411412
QFont font(DEFAULT_FONT_NAME);
412413
font.setPixelSize(DEFAULT_FONT_SIZE);
413414

414-
Style *style = new Style(tr("Default"), font, Qt::white, this);
415+
SubtitleStyle *style =
416+
new SubtitleStyle(tr("Default"), font, Qt::white, this);
415417
m_styles[style->name()] = style;
416418

417419
// Make sure its ends with empty line
@@ -488,13 +490,13 @@ void Script::loadFromXml(QString content) {
488490
movieName = movies.at(0).toElement().text();
489491
}
490492

491-
QString defaultStyleName(tr("Default"));
493+
QString defaultSubtitleStyleName(tr("Default"));
492494

493495
// XXX: Take first font tag.
494496
QDomNodeList fonts = doc.elementsByTagName(nameSpace + "Font");
495497
if (fonts.length() > 0) {
496498
// Font is set, show specific name for style.
497-
defaultStyleName = movieName;
499+
defaultSubtitleStyleName = movieName;
498500

499501
QDomNode fontNode = fonts.at(0);
500502
defaultFont.setFamily(fontNode.toElement().attribute("Id"));
@@ -510,9 +512,9 @@ void Script::loadFromXml(QString content) {
510512
fontNode.toElement().attribute("Color", "FFFFFFFF")));
511513
}
512514

513-
Style *defaultStyle =
514-
new Style(defaultStyleName, defaultFont, defaultColor, this);
515-
m_styles[defaultStyle->name()] = defaultStyle;
515+
SubtitleStyle *defaultSubtitleStyle = new SubtitleStyle(
516+
defaultSubtitleStyleName, defaultFont, defaultColor, this);
517+
m_styles[defaultSubtitleStyle->name()] = defaultSubtitleStyle;
516518

517519
for (int i = 0; i < subtitles.length(); i++) {
518520
QDomNode node = subtitles.at(i);
@@ -530,7 +532,7 @@ void Script::loadFromXml(QString content) {
530532
continue;
531533
}
532534

533-
Style *style = defaultStyle;
535+
SubtitleStyle *style = defaultSubtitleStyle;
534536
QFont font(style->font());
535537
QString color;
536538

@@ -574,16 +576,16 @@ void Script::loadFromXml(QString content) {
574576
(!vPosition.isEmpty()) || (!hPosition.isEmpty()));
575577
if (isOverriden) {
576578
QStringList tokens;
577-
tokens << defaultStyle->name() << hAlign << vAlign << vPosition
579+
tokens << defaultSubtitleStyle->name() << hAlign << vAlign << vPosition
578580
<< hPosition << color;
579581
QString styleName = tokens.join("-");
580582
if (!m_styles.contains(styleName)) {
581583
// Not yet encountered. Built it!
582-
Style *newStyle = new Style(*style, font);
583-
newStyle->setName(styleName);
584+
SubtitleStyle *newSubtitleStyle = new SubtitleStyle(*style, font);
585+
newSubtitleStyle->setName(styleName);
584586

585587
if (!color.isEmpty()) {
586-
newStyle->setPrimaryColour(QColor(color));
588+
newSubtitleStyle->setPrimaryColour(QColor(color));
587589
}
588590

589591
Qt::Alignment alignment = Qt::AlignVCenter;
@@ -597,13 +599,13 @@ void Script::loadFromXml(QString content) {
597599
alignment |= Qt::AlignTop;
598600

599601
// XXX: should inherit.
600-
newStyle->setAlignment(alignment);
602+
newSubtitleStyle->setAlignment(alignment);
601603

602604
// XXX: should inherit.
603-
newStyle->setOffsets(hPosition.toDouble() / 100.0,
604-
vPosition.toDouble() / 100.0);
605+
newSubtitleStyle->setOffsets(hPosition.toDouble() / 100.0,
606+
vPosition.toDouble() / 100.0);
605607

606-
m_styles[styleName] = newStyle;
608+
m_styles[styleName] = newSubtitleStyle;
607609
}
608610
style = m_styles[styleName];
609611
}
@@ -625,7 +627,7 @@ const QString Script::exportList(Script::ScriptFormat p_format) const {
625627

626628
// CSV Headers
627629
QStringList headers;
628-
headers << tr("Row") << tr("Start") << tr("End") << tr("Style")
630+
headers << tr("Row") << tr("Start") << tr("End") << tr("SubtitleStyle")
629631
<< tr("Text") << tr("Comments");
630632
output.append(QString("\"%1\"\n").arg(headers.join("\" ; \"")));
631633

‎src/script.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <QObject>
2323
#include <QString>
2424

25-
#include "style.h"
25+
#include "subtitlestyle.h"
2626
#include "subtitle.h"
2727

2828
/*
@@ -50,11 +50,11 @@ class Script : public QObject {
5050
/*
5151
* Returns a style from its name.
5252
*/
53-
Style *style(const QString &p_name) const;
53+
SubtitleStyle *style(const QString &p_name) const;
5454
/*
5555
* Returns the list of styles
5656
*/
57-
QList<Style *> styles() const;
57+
QList<SubtitleStyle *> styles() const;
5858
/*
5959
* Return the number of subtitles in the script.
6060
*/
@@ -109,7 +109,7 @@ public slots:
109109
/*
110110
* Script styles map.
111111
*/
112-
QMap<QString, Style *> m_styles;
112+
QMap<QString, SubtitleStyle *> m_styles;
113113
/*
114114
* Script subtitles list.
115115
*/

‎src/styleadvanced.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#include "ui_styleadvanced.h"
33

44
#include "script.h"
5-
#include "style.h"
5+
#include "subtitlestyle.h"
66

7-
StyleAdvanced::StyleAdvanced(Style *p_style, QWidget *parent)
7+
StyleAdvanced::StyleAdvanced(SubtitleStyle *p_style, QWidget *parent)
88
: QDialog(parent), ui(new Ui::StyleAdvanced), m_style(p_style) {
99
ui->setupUi(this);
1010

‎src/styleadvanced.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <QDialog>
55

6-
class Style;
6+
class SubtitleStyle;
77

88
namespace Ui {
99
class StyleAdvanced;
@@ -13,7 +13,7 @@ class StyleAdvanced : public QDialog {
1313
Q_OBJECT
1414

1515
public:
16-
explicit StyleAdvanced(Style *p_style, QWidget *parent = nullptr);
16+
explicit StyleAdvanced(SubtitleStyle *p_style, QWidget *parent = nullptr);
1717
~StyleAdvanced();
1818
signals:
1919
void styleChanged();
@@ -22,7 +22,7 @@ protected slots:
2222

2323
private:
2424
Ui::StyleAdvanced *ui;
25-
Style *m_style;
25+
SubtitleStyle *m_style;
2626
};
2727

2828
#endif // STYLEADVANCED_H

‎src/styleeditor.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <QSettings>
2323

2424
#include "script.h"
25-
#include "style.h"
25+
#include "subtitlestyle.h"
2626
#include "styleadvanced.h"
2727

2828
StyleEditor::StyleEditor(QWidget *parent)
@@ -37,7 +37,7 @@ void StyleEditor::setPreset(int p_preset) { m_preset = p_preset; }
3737

3838
void StyleEditor::advancedConfig() {
3939
QString styleName = ui->stylesNames->selectedItems().first()->text();
40-
Style *style = m_script->style(styleName);
40+
SubtitleStyle *style = m_script->style(styleName);
4141
StyleAdvanced config(style, this);
4242
connect(&config, SIGNAL(styleChanged()), SLOT(apply()));
4343
config.move(this->parentWidget()->geometry().center());
@@ -46,12 +46,12 @@ void StyleEditor::advancedConfig() {
4646

4747
void StyleEditor::setScript(Script *script) {
4848
m_script = script;
49-
foreach (Style *style, m_backup)
49+
foreach (SubtitleStyle *style, m_backup)
5050
delete style;
5151
m_backup.clear();
5252
if (m_script) {
53-
foreach (Style *style, m_script->styles()) {
54-
m_backup.append(new Style(*style, style->font()));
53+
foreach (SubtitleStyle *style, m_script->styles()) {
54+
m_backup.append(new SubtitleStyle(*style, style->font()));
5555
}
5656
}
5757
initComponents();
@@ -73,7 +73,7 @@ void StyleEditor::styleSelected() {
7373
ui->fontSize->blockSignals(true);
7474

7575
// Load style from script
76-
Style *first = m_script->style(selected.first()->text());
76+
SubtitleStyle *first = m_script->style(selected.first()->text());
7777
m_colour = first->primaryColour();
7878
QFont font(first->font());
7979
font.setPixelSize(12); // fixed size in combo
@@ -84,7 +84,7 @@ void StyleEditor::styleSelected() {
8484

8585
foreach (QListWidgetItem *item, selected) {
8686
// If any style differs from first, clear fields
87-
Style *style = m_script->style(item->text());
87+
SubtitleStyle *style = m_script->style(item->text());
8888
if (style->font().family() != first->font().family())
8989
ui->fontName->setCurrentIndex(-1);
9090
if (style->font().pixelSize() != first->font().pixelSize())
@@ -103,7 +103,7 @@ void StyleEditor::save() {
103103
settings.beginGroup(QString("Styles-%1").arg(m_preset));
104104
// Save overidden styles into settings
105105
QString line;
106-
foreach (Style *style, m_overidden) {
106+
foreach (SubtitleStyle *style, m_overidden) {
107107
line = QString("%1/%2/%3/%4/%5/%7/%8/%9/%10/%11")
108108
.arg(style->font().family())
109109
.arg(style->font().pixelSize())
@@ -130,8 +130,8 @@ void StyleEditor::reset() {
130130
QSettings settings;
131131
settings.beginGroup(QString("Styles-%1").arg(m_preset));
132132
for (int i = 0; i < m_backup.size(); i++) {
133-
Style *original = m_backup.at(i);
134-
Style *style = m_script->style(original->name());
133+
SubtitleStyle *original = m_backup.at(i);
134+
SubtitleStyle *style = m_script->style(original->name());
135135

136136
QStringList overriden =
137137
settings.value(style->name(), "").toString().split("/");
@@ -178,7 +178,7 @@ void StyleEditor::apply() {
178178
return;
179179

180180
foreach (QListWidgetItem *item, selected) {
181-
Style *style = m_script->style(item->text());
181+
SubtitleStyle *style = m_script->style(item->text());
182182

183183
int fontSize = style->font().pixelSize();
184184
QFont font = style->font();
@@ -269,7 +269,7 @@ void StyleEditor::initComponents() {
269269
return;
270270

271271
ui->stylesNames->clear();
272-
foreach (Style *style, m_script->styles()) {
272+
foreach (SubtitleStyle *style, m_script->styles()) {
273273
// Add to the list
274274
QListWidgetItem *item = new QListWidgetItem(style->name());
275275
ui->stylesNames->addItem(item);

‎src/styleeditor.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Ui {
2525
}
2626

2727
class Script;
28-
class Style;
28+
class SubtitleStyle;
2929

3030
class StyleEditor : public QWidget {
3131
Q_OBJECT
@@ -55,8 +55,8 @@ public slots:
5555

5656
private:
5757
Script *m_script;
58-
QList<Style *> m_backup;
59-
QList<Style *> m_overidden;
58+
QList<SubtitleStyle *> m_backup;
59+
QList<SubtitleStyle *> m_overidden;
6060
QColor m_colour;
6161
int m_preset;
6262
Ui::StyleEditor *ui;

‎src/subtitle.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ void Subtitle::correct(bool p_state) {
8383
m_corrected = p_state && (m_autoDuration > (m_msseEnd - m_msseStart));
8484
}
8585

86-
void Subtitle::setStyle(Style *p_style) { m_style = p_style; }
86+
void Subtitle::setStyle(SubtitleStyle *p_style) { m_style = p_style; }
8787

88-
const Style *Subtitle::style() const { return m_style; }
88+
const SubtitleStyle *Subtitle::style() const { return m_style; }
8989

9090
const Script *Subtitle::script() const { return m_script; }
9191

‎src/subtitle.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <QPoint>
2323
#include <QString>
2424

25-
class Style;
25+
class SubtitleStyle;
2626
class Script;
2727

2828
class SubtitleLine : public QPair<QString, QPoint> {
@@ -46,8 +46,8 @@ class Subtitle : public QObject {
4646
qint64 duration() const;
4747
qint64 autoDuration() const;
4848
int charsRate() const;
49-
void setStyle(Style *p_style);
50-
const Style *style() const;
49+
void setStyle(SubtitleStyle *p_style);
50+
const SubtitleStyle *style() const;
5151
const Script *script() const;
5252
void setText(const QStringList &p_text);
5353
void setText(const QList<SubtitleLine> p_lines);
@@ -74,7 +74,7 @@ class Subtitle : public QObject {
7474
int m_msseStart;
7575
int m_msseEnd;
7676
int m_autoDuration;
77-
const Style *m_style;
77+
const SubtitleStyle *m_style;
7878
QString m_text;
7979
QString m_prettyText;
8080
QString m_pureText;

‎src/subtitlesform.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <QtGui/QPainter>
2121
#include <QGuiApplication>
2222

23-
#include "style.h"
23+
#include "subtitlestyle.h"
2424
#include "subtitlesform.h"
2525
#include "ui_subtitlesform.h"
2626

0 commit comments

Comments
 (0)