diff --git a/app/codec/exportcodec.h b/app/codec/exportcodec.h index d7a41124b..0c9ee0d12 100644 --- a/app/codec/exportcodec.h +++ b/app/codec/exportcodec.h @@ -28,7 +28,9 @@ OLIVE_NAMESPACE_ENTER -class ExportCodec : public QObject { +class ExportCodec : public QObject +{ + Q_OBJECT public: enum Codec { kCodecDNxHD, diff --git a/app/codec/exportformat.h b/app/codec/exportformat.h index 566bb3175..c886f6b5c 100644 --- a/app/codec/exportformat.h +++ b/app/codec/exportformat.h @@ -29,7 +29,9 @@ OLIVE_NAMESPACE_ENTER -class ExportFormat : public QObject { +class ExportFormat : public QObject +{ + Q_OBJECT public: enum Format { kFormatDNxHD, diff --git a/app/dialog/export/codec/codecsection.h b/app/dialog/export/codec/codecsection.h index e187b0df7..77a42e84e 100644 --- a/app/dialog/export/codec/codecsection.h +++ b/app/dialog/export/codec/codecsection.h @@ -29,6 +29,7 @@ OLIVE_NAMESPACE_ENTER class CodecSection : public QWidget { + Q_OBJECT public: CodecSection(QWidget* parent = nullptr); diff --git a/app/dialog/export/codec/h264section.h b/app/dialog/export/codec/h264section.h index 6e85e632a..f357d4375 100644 --- a/app/dialog/export/codec/h264section.h +++ b/app/dialog/export/codec/h264section.h @@ -31,6 +31,7 @@ OLIVE_NAMESPACE_ENTER class H264CRFSection : public QWidget { + Q_OBJECT public: H264CRFSection(QWidget* parent = nullptr); @@ -49,6 +50,7 @@ private: class H264BitRateSection : public QWidget { + Q_OBJECT public: H264BitRateSection(QWidget* parent = nullptr); @@ -71,6 +73,7 @@ private: class H264FileSizeSection : public QWidget { + Q_OBJECT public: H264FileSizeSection(QWidget* parent = nullptr); @@ -86,6 +89,7 @@ private: class H264Section : public CodecSection { + Q_OBJECT public: enum CompressionMethod { kConstantRateFactor, diff --git a/app/dialog/export/codec/imagesection.h b/app/dialog/export/codec/imagesection.h index a40d4dd8a..5fa60dbdc 100644 --- a/app/dialog/export/codec/imagesection.h +++ b/app/dialog/export/codec/imagesection.h @@ -29,6 +29,7 @@ OLIVE_NAMESPACE_ENTER class ImageSection : public CodecSection { + Q_OBJECT public: ImageSection(QWidget* parent = nullptr); diff --git a/app/dialog/export/exportaudiotab.h b/app/dialog/export/exportaudiotab.h index 924d0b655..51aaa8f32 100644 --- a/app/dialog/export/exportaudiotab.h +++ b/app/dialog/export/exportaudiotab.h @@ -31,6 +31,7 @@ OLIVE_NAMESPACE_ENTER class ExportAudioTab : public QWidget { + Q_OBJECT public: ExportAudioTab(QWidget* parent = nullptr); diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.h b/app/dialog/footageproperties/streamproperties/videostreamproperties.h index 2b82b80d1..e83ebd8da 100644 --- a/app/dialog/footageproperties/streamproperties/videostreamproperties.h +++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.h @@ -34,6 +34,7 @@ OLIVE_NAMESPACE_ENTER class VideoStreamProperties : public StreamProperties { + Q_OBJECT public: VideoStreamProperties(VideoStreamPtr stream); diff --git a/app/node/audio/pan/pan.h b/app/node/audio/pan/pan.h index 9ec58b110..d8d9f3989 100644 --- a/app/node/audio/pan/pan.h +++ b/app/node/audio/pan/pan.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class PanNode : public Node { + Q_OBJECT public: PanNode(); diff --git a/app/node/audio/volume/volume.h b/app/node/audio/volume/volume.h index c17656241..e4c0ce5d4 100644 --- a/app/node/audio/volume/volume.h +++ b/app/node/audio/volume/volume.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class VolumeNode : public MathNodeBase { + Q_OBJECT public: VolumeNode(); diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.h b/app/node/block/transition/crossdissolve/crossdissolvetransition.h index 98daf4330..8b6d3157c 100644 --- a/app/node/block/transition/crossdissolve/crossdissolvetransition.h +++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class CrossDissolveTransition : public TransitionBlock { + Q_OBJECT public: CrossDissolveTransition(); diff --git a/app/node/block/transition/diptocolor/diptocolortransition.h b/app/node/block/transition/diptocolor/diptocolortransition.h index 660b5fcfc..127c5682c 100644 --- a/app/node/block/transition/diptocolor/diptocolortransition.h +++ b/app/node/block/transition/diptocolor/diptocolortransition.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class DipToColorTransition : public TransitionBlock { + Q_OBJECT public: DipToColorTransition(); diff --git a/app/node/block/transition/transition.h b/app/node/block/transition/transition.h index d8c5c6a39..4a01e6fb1 100644 --- a/app/node/block/transition/transition.h +++ b/app/node/block/transition/transition.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class TransitionBlock : public Block { + Q_OBJECT public: TransitionBlock(); diff --git a/app/node/filter/blur/blur.h b/app/node/filter/blur/blur.h index 088363991..5fd7cc12d 100644 --- a/app/node/filter/blur/blur.h +++ b/app/node/filter/blur/blur.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class BlurFilterNode : public Node { + Q_OBJECT public: BlurFilterNode(); diff --git a/app/node/filter/stroke/stroke.h b/app/node/filter/stroke/stroke.h index 044f9ba95..418647370 100644 --- a/app/node/filter/stroke/stroke.h +++ b/app/node/filter/stroke/stroke.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class StrokeFilterNode : public Node { + Q_OBJECT public: StrokeFilterNode(); diff --git a/app/node/generator/polygon/polygon.h b/app/node/generator/polygon/polygon.h index d764ae7be..fb3aeeeae 100644 --- a/app/node/generator/polygon/polygon.h +++ b/app/node/generator/polygon/polygon.h @@ -28,6 +28,7 @@ OLIVE_NAMESPACE_ENTER class PolygonGenerator : public Node { + Q_OBJECT public: PolygonGenerator(); diff --git a/app/node/generator/solid/solid.h b/app/node/generator/solid/solid.h index 101c8f15a..3572c3cd3 100644 --- a/app/node/generator/solid/solid.h +++ b/app/node/generator/solid/solid.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class SolidGenerator : public Node { + Q_OBJECT public: SolidGenerator(); diff --git a/app/node/generator/text/text.h b/app/node/generator/text/text.h index cb80fd035..89d2661a3 100644 --- a/app/node/generator/text/text.h +++ b/app/node/generator/text/text.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class TextGenerator : public Node { + Q_OBJECT public: TextGenerator(); diff --git a/app/node/input/media/audio/audio.h b/app/node/input/media/audio/audio.h index 5cebdcc3c..0af4e0267 100644 --- a/app/node/input/media/audio/audio.h +++ b/app/node/input/media/audio/audio.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class AudioInput : public MediaInput { + Q_OBJECT public: AudioInput() = default; diff --git a/app/node/input/media/video/video.h b/app/node/input/media/video/video.h index 7000ea82b..caa90c2ac 100644 --- a/app/node/input/media/video/video.h +++ b/app/node/input/media/video/video.h @@ -30,6 +30,7 @@ OLIVE_NAMESPACE_ENTER class VideoInput : public MediaInput { + Q_OBJECT public: VideoInput() = default; diff --git a/app/node/math/math/math.h b/app/node/math/math/math.h index 97edcdf0b..04bd1debe 100644 --- a/app/node/math/math/math.h +++ b/app/node/math/math/math.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class MathNode : public MathNodeBase { + Q_OBJECT public: MathNode(); diff --git a/app/node/math/merge/merge.h b/app/node/math/merge/merge.h index 57182caaf..52d59a97d 100644 --- a/app/node/math/merge/merge.h +++ b/app/node/math/merge/merge.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class MergeNode : public Node { + Q_OBJECT public: MergeNode(); diff --git a/app/node/math/trigonometry/trigonometry.h b/app/node/math/trigonometry/trigonometry.h index b1524616a..a0e4f5d71 100644 --- a/app/node/math/trigonometry/trigonometry.h +++ b/app/node/math/trigonometry/trigonometry.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class TrigonometryNode : public Node { + Q_OBJECT public: TrigonometryNode(); diff --git a/app/node/output.h b/app/node/output.h index 42c5f5ec6..10439bf0f 100644 --- a/app/node/output.h +++ b/app/node/output.h @@ -31,6 +31,7 @@ OLIVE_NAMESPACE_ENTER */ class NodeOutput : public NodeParam { + Q_OBJECT public: /** * @brief NodeOutput Constructor diff --git a/app/panel/audiomonitor/audiomonitor.h b/app/panel/audiomonitor/audiomonitor.h index 513ec2750..f9fc32667 100644 --- a/app/panel/audiomonitor/audiomonitor.h +++ b/app/panel/audiomonitor/audiomonitor.h @@ -31,6 +31,7 @@ OLIVE_NAMESPACE_ENTER */ class AudioMonitorPanel : public PanelWidget { + Q_OBJECT public: AudioMonitorPanel(QWidget* parent = nullptr); diff --git a/app/panel/sequenceviewer/sequenceviewer.h b/app/panel/sequenceviewer/sequenceviewer.h index 4182bb793..a0e0ebdca 100644 --- a/app/panel/sequenceviewer/sequenceviewer.h +++ b/app/panel/sequenceviewer/sequenceviewer.h @@ -27,6 +27,7 @@ OLIVE_NAMESPACE_ENTER class SequenceViewerPanel : public ViewerPanel { + Q_OBJECT public: SequenceViewerPanel(QWidget* parent); diff --git a/app/project/projectviewmodel.cpp b/app/project/projectviewmodel.cpp index a1ba9b481..d5ff1b552 100644 --- a/app/project/projectviewmodel.cpp +++ b/app/project/projectviewmodel.cpp @@ -509,7 +509,7 @@ ProjectViewModel::MoveItemCommand::MoveItemCommand(ProjectViewModel *model, { source_ = static_cast(item->parent()); - setText(tr("Move Item")); + setText(QCoreApplication::translate("MoveItemCommand", "Move Item")); } Project *ProjectViewModel::MoveItemCommand::GetRelevantProject() const @@ -535,7 +535,7 @@ ProjectViewModel::RenameItemCommand::RenameItemCommand(ProjectViewModel* model, { old_name_ = item->name(); - setText(tr("Rename Item")); + setText(QCoreApplication::translate("RenameItemCommand", "Rename Item")); } Project *ProjectViewModel::RenameItemCommand::GetRelevantProject() const diff --git a/app/project/projectviewmodel.h b/app/project/projectviewmodel.h index e3de6e33a..255c76d36 100644 --- a/app/project/projectviewmodel.h +++ b/app/project/projectviewmodel.h @@ -39,6 +39,7 @@ OLIVE_NAMESPACE_ENTER */ class ProjectViewModel : public QAbstractItemModel { + Q_OBJECT public: enum ColumnType { /// Media name diff --git a/app/task/conform/conform.h b/app/task/conform/conform.h index b65d2d689..99e8b7c5f 100644 --- a/app/task/conform/conform.h +++ b/app/task/conform/conform.h @@ -29,6 +29,7 @@ OLIVE_NAMESPACE_ENTER class ConformTask : public Task { + Q_OBJECT public: ConformTask(AudioStreamPtr stream, const AudioParams& params); diff --git a/app/task/precache/precachetask.h b/app/task/precache/precachetask.h index 960d2fa02..6708475a7 100644 --- a/app/task/precache/precachetask.h +++ b/app/task/precache/precachetask.h @@ -30,6 +30,7 @@ OLIVE_NAMESPACE_ENTER class PreCacheTask : public RenderTask { + Q_OBJECT public: PreCacheTask(VideoStreamPtr footage, Sequence* sequence); diff --git a/app/widget/nodetableview/nodetableview.h b/app/widget/nodetableview/nodetableview.h index de5d920d3..c049e5bb6 100644 --- a/app/widget/nodetableview/nodetableview.h +++ b/app/widget/nodetableview/nodetableview.h @@ -29,6 +29,7 @@ OLIVE_NAMESPACE_ENTER class NodeTableView : public QTreeWidget { + Q_OBJECT public: NodeTableView(QWidget* parent = nullptr); diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp index f1f7e83fd..2a012ee5e 100644 --- a/app/widget/timelinewidget/tool/import.cpp +++ b/app/widget/timelinewidget/tool/import.cpp @@ -314,17 +314,17 @@ void ImportTool::DropGhosts(bool insert) DropWithoutSequenceBehavior behavior = static_cast(Config::Current()["DropWithoutSequenceBehavior"].toInt()); if (behavior == kDWSAsk) { - QCheckBox* dont_ask_again_box = new QCheckBox(tr("Don't ask me again")); + QCheckBox* dont_ask_again_box = new QCheckBox(QCoreApplication::translate("ImportTool", "Don't ask me again")); QMessageBox mbox(parent()); mbox.setIcon(QMessageBox::Question); - mbox.setWindowTitle(tr("No Active Sequence")); - mbox.setText(tr("No sequence is currently open. Would you like to create one?")); + mbox.setWindowTitle(QCoreApplication::translate("ImportTool", "No Active Sequence")); + mbox.setText(QCoreApplication::translate("ImportTool", "No sequence is currently open. Would you like to create one?")); mbox.setCheckBox(dont_ask_again_box); - QPushButton* auto_params_btn = mbox.addButton(tr("Automatically Detect Parameters From Footage"), QMessageBox::YesRole); - QPushButton* manual_params_btn = mbox.addButton(tr("Set Parameters Manually"), QMessageBox::NoRole); + QPushButton* auto_params_btn = mbox.addButton(QCoreApplication::translate("ImportTool", "Automatically Detect Parameters From Footage"), QMessageBox::YesRole); + QPushButton* manual_params_btn = mbox.addButton(QCoreApplication::translate("ImportTool", "Set Parameters Manually"), QMessageBox::NoRole); mbox.addButton(QMessageBox::Cancel); mbox.exec(); @@ -498,9 +498,4 @@ QList ImportTool::FootageToDraggedFootage(QList FootageToDraggedFootage(QList footage); - QString tr(const char* s); - void FootageToGhosts(rational ghost_start, const QList& footage, const rational &dest_tb, const int &track_start); void PrepGhosts(const rational &frame, const int &track_index);