Merge branch 'wangqr_time_video' into feature

arch1t3cht · Aug 1, 2022 · 69d79ac · 69d79ac
2 parents 84d90ce + c232ef6
commit 69d79ac
Show file tree

Hide file tree

Showing 19 changed files with 1,134 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/src/bitmaps/button/button_align_16.png b/src/bitmaps/button/button_align_16.png
diff --git a/src/bitmaps/button/button_align_24.png b/src/bitmaps/button/button_align_24.png
diff --git a/src/bitmaps/button/button_align_32.png b/src/bitmaps/button/button_align_32.png
diff --git a/src/bitmaps/button/button_align_48.png b/src/bitmaps/button/button_align_48.png
diff --git a/src/bitmaps/button/button_align_64.png b/src/bitmaps/button/button_align_64.png
diff --git a/src/bitmaps/manifest.respack b/src/bitmaps/manifest.respack
@@ -51,6 +51,11 @@ button/bugtracker_button_24.png
 button/bugtracker_button_32.png
 button/bugtracker_button_48.png
 button/bugtracker_button_64.png
+button/button_align_16.png
+button/button_align_24.png
+button/button_align_32.png
+button/button_align_48.png
+button/button_align_64.png
 button/button_audio_commit_16.png
 button/button_audio_commit_24.png
 button/button_audio_commit_32.png

diff --git a/src/colour_button.h b/src/colour_button.h
@@ -43,6 +43,12 @@ class ColourButton: public wxButton {
 
 	/// Get the currently selected color
 	agi::Color GetColor() { return colour; }
+
+	void SetColor(agi::Color color)
+	{
+		colour = color;
+		UpdateBitmap();
+	}
 };
 
 struct ColorValidator final : public wxValidator {

diff --git a/src/command/time.cpp b/src/command/time.cpp
@@ -235,6 +235,18 @@ struct time_snap_scene final : public validate_video_loaded {
 	}
 };
 
+struct time_align_subtitle_to_point final : public validate_video_loaded {
+	CMD_NAME("time/align")
+	CMD_ICON(button_align)
+	STR_MENU("Align subtitle to video")
+	STR_DISP("Align subtitle to video")
+	STR_HELP("Align subtitle to video by key points")
+	void operator()(agi::Context* c) override {
+		c->videoController->Stop();
+		ShowAlignToVideoDialog(c);
+	}
+};
+
 struct time_add_lead_both final : public Command {
 	CMD_NAME("time/lead/both")
 	STR_MENU("Add lead in and out")
@@ -393,6 +405,7 @@ namespace cmd {
 		reg(agi::make_unique<time_snap_end_video>());
 		reg(agi::make_unique<time_snap_scene>());
 		reg(agi::make_unique<time_snap_start_video>());
+		reg(agi::make_unique<time_align_subtitle_to_point>());
 		reg(agi::make_unique<time_start_decrease>());
 		reg(agi::make_unique<time_start_increase>());
 	}