Added toolbar for vector clip tool. Not functional yet.

Originally committed to SVN as r1367.

aegisub/res.rc

@@ -142,6 +142,13 @@ visual_rotatexy BITMAP "bitmaps/visual_rotatexy.bmp"
 visual_scale BITMAP "bitmaps/visual_scale.bmp"
 visual_clip BITMAP "bitmaps/visual_clip.bmp"
 visual_vector_clip BITMAP "bitmaps/visual_vector_clip.bmp"
+visual_vector_clip_drag BITMAP "bitmaps/visual_vector_clip_drag.bmp"
+visual_vector_clip_line BITMAP "bitmaps/visual_vector_clip_line.bmp"
+visual_vector_clip_bicubic BITMAP "bitmaps/visual_vector_clip_bicubic.bmp"
+visual_vector_clip_remove BITMAP "bitmaps/visual_vector_clip_remove.bmp"
+visual_vector_clip_convert BITMAP "bitmaps/visual_vector_clip_convert.bmp"
+visual_vector_clip_insert BITMAP "bitmaps/visual_vector_clip_insert.bmp"
+visual_vector_clip_freehand BITMAP "bitmaps/visual_vector_clip_freehand.bmp"
 visual_realtime BITMAP "bitmaps/visual_realtime.bmp"
 
 arrow_up BITMAP "bitmaps/arrow_up.bmp"

aegisub/video_box.cpp

@@ -132,6 +132,7 @@ VideoBox::VideoBox(wxWindow *parent)
 	typeSizer->Add(scale,0,wxEXPAND,0);
 	typeSizer->Add(clip,0,wxEXPAND,0);
 	typeSizer->Add(vectorClip,0,wxEXPAND | wxBOTTOM,5);
+	typeSizer->Add(new wxStaticLine(videoPage),0,wxEXPAND | wxBOTTOM,5);
 	typeSizer->Add(realtime,0,wxEXPAND,0);
 	typeSizer->AddStretchSpacer(1);
 

aegisub/video_display.cpp

@@ -668,7 +668,7 @@ void VideoDisplay::SetVisualMode(int mode) {
 			case 3: visual = new VisualToolRotateXY(this); break;
 			case 4: visual = new VisualToolScale(this); break;
 			case 5: visual = new VisualToolClip(this); break;
-			case 6: visual = new VisualToolVectorClip(this); break;
+			case 6: visual = new VisualToolVectorClip(this,toolBar,box); break;
 			default: visual = NULL;
 		}
 

aegisub/visual_tool_vector_clip.cpp

@@ -40,12 +40,59 @@
 #include "ass_dialogue.h"
 
 
+///////
+// IDs
+enum {
+	BUTTON_DRAG = 1300,
+	BUTTON_LINE,
+	BUTTON_BICUBIC,
+	BUTTON_INSERT,
+	BUTTON_REMOVE,
+	BUTTON_CONVERT,
+	BUTTON_FREEHAND
+};
+
+
 ///////////////
 // Constructor
-VisualToolVectorClip::VisualToolVectorClip(VideoDisplay *parent)
+VisualToolVectorClip::VisualToolVectorClip(VideoDisplay *parent,wxSizer *toolbar,wxWindow *toolWindow)
 : VisualTool(parent)
 {
 	DoRefresh();
+
+	// Create toolbar
+	wxButton *drag = new wxBitmapButton(toolWindow,BUTTON_DRAG,wxBITMAP(visual_vector_clip_drag));
+	wxButton *line = new wxBitmapButton(toolWindow,BUTTON_LINE,wxBITMAP(visual_vector_clip_line));
+	wxButton *bicubic = new wxBitmapButton(toolWindow,BUTTON_BICUBIC,wxBITMAP(visual_vector_clip_bicubic));
+	wxButton *convert = new wxBitmapButton(toolWindow,BUTTON_CONVERT,wxBITMAP(visual_vector_clip_convert));
+	wxButton *insert = new wxBitmapButton(toolWindow,BUTTON_INSERT,wxBITMAP(visual_vector_clip_insert));
+	wxButton *remove = new wxBitmapButton(toolWindow,BUTTON_REMOVE,wxBITMAP(visual_vector_clip_remove));
+	wxButton *freehand = new wxBitmapButton(toolWindow,BUTTON_FREEHAND,wxBITMAP(visual_vector_clip_freehand));
+	drag->SetToolTip(_("Drag control points."));
+	line->SetToolTip(_("Appends a line."));
+	bicubic->SetToolTip(_("Appends a bezier bicubic curve."));
+	convert->SetToolTip(_("Converts a segment between line and bicubic."));
+	insert->SetToolTip(_("Inserts a control point."));
+	remove->SetToolTip(_("Removes a control point."));
+	freehand->SetToolTip(_("Draws a freehand shape."));
+	ConnectButton(drag);
+	ConnectButton(line);
+	ConnectButton(bicubic);
+	ConnectButton(convert);
+	ConnectButton(insert);
+	ConnectButton(remove);
+	ConnectButton(freehand);
+	toolbar->Add(drag,0,wxEXPAND);
+	toolbar->Add(line,0,wxEXPAND);
+	toolbar->Add(bicubic,0,wxEXPAND | wxRIGHT,5);
+	toolbar->Add(new wxStaticLine(toolWindow,-1,wxDefaultPosition,wxDefaultSize,wxLI_VERTICAL),0,wxEXPAND | wxRIGHT,5);
+	toolbar->Add(convert,0,wxEXPAND);
+	toolbar->Add(insert,0,wxEXPAND);
+	toolbar->Add(remove,0,wxEXPAND | wxRIGHT,5);
+	toolbar->Add(new wxStaticLine(toolWindow,-1,wxDefaultPosition,wxDefaultSize,wxLI_VERTICAL),0,wxEXPAND | wxRIGHT,5);
+	toolbar->Add(freehand,0,wxEXPAND);
+	toolbar->AddStretchSpacer(1);
+
 }
 
 

aegisub/visual_tool_vector_clip.h

@@ -57,7 +57,7 @@ private:
 	void DoRefresh();
 
 public:
-	VisualToolVectorClip(VideoDisplay *parent);
+	VisualToolVectorClip(VideoDisplay *parent,wxSizer *toolbar,wxWindow *toolWindow);
 
 	void Update();
 	void Draw();